You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/12/24 02:13:21 UTC

[1/2] incubator-trafodion git commit: Got needed info

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 728dbbf3e -> fc9651f78


Got needed info


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/07b530d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/07b530d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/07b530d8

Branch: refs/heads/master
Commit: 07b530d81ed53588707d7db9803a31192f508a01
Parents: e54c732
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Tue Dec 22 09:32:35 2015 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Tue Dec 22 09:32:35 2015 +0800

----------------------------------------------------------------------
 dcs/bin/start-dcs.sh | 2 +-
 dcs/bin/stop-dcs.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/07b530d8/dcs/bin/start-dcs.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/start-dcs.sh b/dcs/bin/start-dcs.sh
index 5337704..dd77838 100755
--- a/dcs/bin/start-dcs.sh
+++ b/dcs/bin/start-dcs.sh
@@ -39,7 +39,7 @@ fi
 
 "$bin"/dcs-daemons.sh --config "${DCS_CONF_DIR}" start zookeeper
 
-master=`$bin/dcs --config "${DCS_CONF_DIR}" org.trafodion.dcs.zookeeper.ZkUtil /$USER/dcs/master`
+master=`$bin/dcs --config "${DCS_CONF_DIR}" org.trafodion.dcs.zookeeper.ZkUtil /$USER/dcs/master|tail -n 1`
 errCode=$?
 if [ $errCode -ne 0 ]
 then

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/07b530d8/dcs/bin/stop-dcs.sh
----------------------------------------------------------------------
diff --git a/dcs/bin/stop-dcs.sh b/dcs/bin/stop-dcs.sh
index 682fa92..8da9ad4 100755
--- a/dcs/bin/stop-dcs.sh
+++ b/dcs/bin/stop-dcs.sh
@@ -38,7 +38,7 @@ fi
 
 "$bin"/dcs-daemons.sh --config "${DCS_CONF_DIR}" --hosts "${DCS_BACKUP_MASTERS}" stop master-backup
 
-master=`$bin/dcs --config "${DCS_CONF_DIR}" org.trafodion.dcs.zookeeper.ZkUtil /$USER/dcs/master`
+master=`$bin/dcs --config "${DCS_CONF_DIR}" org.trafodion.dcs.zookeeper.ZkUtil /$USER/dcs/master|tail -n 1`
 errCode=$?
 if [ $errCode -ne 0 ]
 then


[2/2] incubator-trafodion git commit: Merge [TRAFODION-1719] PR-239 dcsstart/dcsstop does not work if zookeeper logging is less restrictive than ERROR

Posted by ar...@apache.org.
Merge [TRAFODION-1719] PR-239 dcsstart/dcsstop does not work if zookeeper logging is less restrictive than ERROR


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fc9651f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fc9651f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fc9651f7

Branch: refs/heads/master
Commit: fc9651f7874beef8fe724abb1361c33ba7f449db
Parents: 728dbbf 07b530d
Author: Arvind Narain <ar...@apache.org>
Authored: Thu Dec 24 01:10:28 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Thu Dec 24 01:10:28 2015 +0000

----------------------------------------------------------------------
 dcs/bin/start-dcs.sh | 2 +-
 dcs/bin/stop-dcs.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fc9651f7/dcs/bin/start-dcs.sh
----------------------------------------------------------------------