Clone
Zalo Correa <zalo.correa@esgyn.com>
committed
on 24 Feb 17
Merge remote branch 'origin/master' into TRAFODION-2001
Conflicts:
core/sqf/monitor/linux/config.cxx
core/sqf/monitor/linux/pnodeconfig.cx… Show more
Merge remote branch 'origin/master' into TRAFODION-2001

Conflicts:

        core/sqf/monitor/linux/config.cxx

        core/sqf/monitor/linux/pnodeconfig.cxx

        core/sqf/monitor/linux/pnodeconfig.h

        core/sqf/monitor/linux/reqqueue.cxx

        core/sqf/monitor/linux/shell.cxx

        core/sqf/sql/scripts/gensq.pl

        core/sqf/sql/scripts/sqconfig

        core/sqf/sql/scripts/sqconfig.sample

        core/sqf/sql/scripts/sqgen

        core/sqf/sql/scripts/sqnodestatus

Show less

default + 4 more