You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/11/27 03:12:48 UTC
[1/4] git commit: ACCUMULO-1795 make the default hadoop version
consistent to avoid confusion
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 80fd64797 -> c70d14e2b
ACCUMULO-1795 make the default hadoop version consistent to avoid confusion
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4eb0c683
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4eb0c683
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4eb0c683
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4eb0c683be32d380c43dc136d59111c6bd898e05
Parents: 8d39b09
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 26 17:48:19 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 26 17:48:19 2013 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eb0c683/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a8d0500..ac57b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -869,7 +869,7 @@
<properties>
<targetJdk>1.6</targetJdk>
<!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
- <hadoop.version>1.0.4</hadoop.version>
+ <hadoop.version>0.20.203.0</hadoop.version>
<!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -->
<slf4j.version>1.4.3</slf4j.version>
<zookeeper.version>3.3.1</zookeeper.version>
[2/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/64aab864
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/64aab864
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/64aab864
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 64aab864aaa421845a6871fe734e4897c3ac2637
Parents: e7e2238 4eb0c68
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 26 17:49:04 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 26 17:49:04 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/4] git commit: ACCUMULO-1932 Add in a configuration for the
Accumulo user,
and then make sure we exec the magitator as that user so we don't restart the
master and gc as root.
Posted by el...@apache.org.
ACCUMULO-1932 Add in a configuration for the Accumulo user, and then make sure we exec the magitator as that user so we
don't restart the master and gc as root.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4be3d662
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4be3d662
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4be3d662
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4be3d662550f3c5ecf6b1a501d2a9beafa5b2d9a
Parents: 64aab86
Author: Josh Elser <el...@apache.org>
Authored: Tue Nov 26 21:08:27 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Nov 26 21:08:27 2013 -0500
----------------------------------------------------------------------
test/system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/start-agitator.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4be3d662/test/system/continuous/continuous-env.sh.example
----------------------------------------------------------------------
diff --git a/test/system/continuous/continuous-env.sh.example b/test/system/continuous/continuous-env.sh.example
index 833393a..af80081 100644
--- a/test/system/continuous/continuous-env.sh.example
+++ b/test/system/continuous/continuous-env.sh.example
@@ -24,6 +24,7 @@ ZOOKEEPER_HOME=${ZOOKEEPER_HOME:-/opt/zookeeper}
CONTINUOUS_LOG_DIR=$ACCUMULO_HOME/test/system/continuous/logs
INSTANCE_NAME=instance
ZOO_KEEPERS=zhost1,zhost2
+ACCUMULO_USER=accumulo
USER=user
PASS=pass
TABLE=ci
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4be3d662/test/system/continuous/start-agitator.sh
----------------------------------------------------------------------
diff --git a/test/system/continuous/start-agitator.sh b/test/system/continuous/start-agitator.sh
index 980cd77..fd43a14 100755
--- a/test/system/continuous/start-agitator.sh
+++ b/test/system/continuous/start-agitator.sh
@@ -23,4 +23,4 @@ mkdir -p $CONTINUOUS_LOG_DIR
nohup ./agitator.pl $KILL_SLEEP_TIME $TUP_SLEEP_TIME $MIN_KILL $MAX_KILL >$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_agitator.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_agitator.err &
-nohup ./magitator.pl $MASTER_KILL_SLEEP_TIME $MASTER_RESTART_SLEEP_TIME >$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_magitator.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_magitator.err &
+su -c "nohup $CONTINUOUS_CONF_DIR/magitator.pl $MASTER_KILL_SLEEP_TIME $MASTER_RESTART_SLEEP_TIME >$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_magitator.out 2>$CONTINUOUS_LOG_DIR/`date +%Y%m%d%H%M%S`_`hostname`_magitator.err &" -m - $ACCUMULO_USER
[4/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c70d14e2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c70d14e2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c70d14e2
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c70d14e2b1e7dea3f74aca11a8806750f0767c08
Parents: 80fd647 4be3d66
Author: Josh Elser <el...@apache.org>
Authored: Tue Nov 26 21:10:36 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Tue Nov 26 21:10:36 2013 -0500
----------------------------------------------------------------------
test/system/continuous/continuous-env.sh.example | 1 +
test/system/continuous/start-agitator.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c70d14e2/test/system/continuous/start-agitator.sh
----------------------------------------------------------------------