Merge [TRAFODION-2958] PR 1472 Consolidate dcs master and backup in conf
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/290570e7 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/290570e7 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/290570e7 Branch: refs/heads/master Commit: 290570e72ca75ac2919fdca1fcfa9cdc9f21ab71 Parents: dd301dc 86ba12e Author: Dave Birdsall <[email protected]> Authored: Wed Mar 14 19:25:26 2018 +0000 Committer: Dave Birdsall <[email protected]> Committed: Wed Mar 14 19:25:26 2018 +0000 ---------------------------------------------------------------------- .rat-excludes | 3 +- RAT_README | 3 +- core/sqf/sql/scripts/dcscheck | 24 +- core/sqf/sql/scripts/dcsstart | 8 +- core/sqf/sql/scripts/dcsstop | 9 +- core/sqf/sql/scripts/install_local_hadoop | 5 + core/sqf/sql/scripts/install_traf_components | 5 +- core/sqf/sql/scripts/sqcheck | 6 +- dcs/bin/dcs-config.sh | 14 +- dcs/bin/dcs-daemon.sh | 48 +++- dcs/bin/getActiveMaster.sh | 80 +++++++ dcs/bin/master-backup.sh | 36 +-- dcs/bin/scripts/dcsbind.sh | 64 ++++-- dcs/bin/scripts/dcsunbind.sh | 43 ++-- dcs/bin/scripts/parse_dcs_site.py | 18 +- dcs/bin/start-dcs.sh | 9 +- dcs/bin/stop-dcs.sh | 16 +- dcs/conf/backup-masters | 0 dcs/conf/master | 0 dcs/conf/masters | 0 .../main/asciidoc/_chapters/configuration.adoc | 220 ++++++++----------- .../TRAFODION/2.1/configuration/dcs-env.xml | 7 +- .../2.1/package/scripts/trafodionnode.py | 13 +- install/python-installer/scripts/dcs_setup.py | 9 +- 24 files changed, 355 insertions(+), 285 deletions(-) ----------------------------------------------------------------------
