accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Date Mon, 23 Sep 2013 00:55:35 GMT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/continuous/stop-batchwalkers.sh
	test/system/continuous/stop-ingest.sh
	test/system/continuous/stop-scanners.sh
	test/system/continuous/stop-walkers.sh


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b773339
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b773339
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b773339

Branch: refs/heads/master
Commit: 3b773339f4126f55aa560385f4db5829ff894ce9
Parents: 7db1a44 70fe481
Author: Josh Elser <elserj@apache.org>
Authored: Sun Sep 22 20:55:09 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Sep 22 20:55:09 2013 -0400

----------------------------------------------------------------------
 test/system/continuous/stop-batchwalkers.sh | 2 +-
 test/system/continuous/stop-ingest.sh       | 2 +-
 test/system/continuous/stop-scanners.sh     | 2 +-
 test/system/continuous/stop-walkers.sh      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b773339/test/system/continuous/stop-batchwalkers.sh
----------------------------------------------------------------------
diff --cc test/system/continuous/stop-batchwalkers.sh
index 32f2202,359946d..502a7c8
--- a/test/system/continuous/stop-batchwalkers.sh
+++ b/test/system/continuous/stop-batchwalkers.sh
@@@ -18,5 -18,5 +18,5 @@@
  CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
  . $CONTINUOUS_CONF_DIR/continuous-env.sh
  
- pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "pkill -f [o]rg.apache.accumulo.test.continuous.ContinuousBatchWalker"
< /dev/null
 -pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "pkill -f '[o]rg.apache.accumulo.server.test.continuous.ContinuousBatchWalker'"
< /dev/null
++pssh -h $CONTINUOUS_CONF_DIR/batch_walkers.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousBatchWalker'"
< /dev/null
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b773339/test/system/continuous/stop-ingest.sh
----------------------------------------------------------------------
diff --cc test/system/continuous/stop-ingest.sh
index 01c6a38,7e2c54e..22f486a
--- a/test/system/continuous/stop-ingest.sh
+++ b/test/system/continuous/stop-ingest.sh
@@@ -18,5 -18,5 +18,5 @@@
  CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
  . $CONTINUOUS_CONF_DIR/continuous-env.sh
  
- pssh -h $CONTINUOUS_CONF_DIR/ingesters.txt "pkill -f [o]rg.apache.accumulo.test.continuous.ContinuousIngest"
< /dev/null
 -pssh -h $CONTINUOUS_CONF_DIR/ingesters.txt "pkill -f '[o]rg.apache.accumulo.server.test.continuous.ContinuousIngest'"
< /dev/null
++pssh -h $CONTINUOUS_CONF_DIR/ingesters.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousIngest'"
< /dev/null
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b773339/test/system/continuous/stop-scanners.sh
----------------------------------------------------------------------
diff --cc test/system/continuous/stop-scanners.sh
index f53c3e5,5f1a415..dd0d34c
--- a/test/system/continuous/stop-scanners.sh
+++ b/test/system/continuous/stop-scanners.sh
@@@ -18,5 -18,5 +18,5 @@@
  CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
  . $CONTINUOUS_CONF_DIR/continuous-env.sh
  
- pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "pkill -f [o]rg.apache.accumulo.test.continuous.ContinuousScanner"
< /dev/null
 -pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "pkill -f '[o]rg.apache.accumulo.server.test.continuous.ContinuousScanner'"
< /dev/null
++pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousScanner'"
< /dev/null
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b773339/test/system/continuous/stop-walkers.sh
----------------------------------------------------------------------
diff --cc test/system/continuous/stop-walkers.sh
index f86c34d,0d391bf..cfa786f
--- a/test/system/continuous/stop-walkers.sh
+++ b/test/system/continuous/stop-walkers.sh
@@@ -18,5 -18,5 +18,5 @@@
  CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
  . $CONTINUOUS_CONF_DIR/continuous-env.sh
  
- pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f [o]rg.apache.accumulo.test.continuous.ContinuousWalk"
< /dev/null
 -pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f '[o]rg.apache.accumulo.server.test.continuous.ContinuousWalk'"
< /dev/null
++pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f '[o]rg.apache.accumulo.test.continuous.ContinuousWalk'"
< /dev/null
  


Mime
View raw message