You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/11/19 18:14:53 UTC

[1/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 32b6b6576 -> d8b4ba942
  refs/heads/1.5.1-SNAPSHOT bf8c90a02 -> 6f07d7aaa
  refs/heads/1.6.0-SNAPSHOT 55016d776 -> 3875de367
  refs/heads/master 1af632306 -> 4ba658750


ACCUMULO-1901 treat the gc start/stop like the redundant masters


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 4976a935f2566ee648d20c3bc5381bc22edc51ec
Parents: 32b6b65
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 10:52:29 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 10:52:29 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4976a935/bin/start-here.sh
----------------------------------------------------------------------
diff --git a/bin/start-here.sh b/bin/start-here.sh
index 22c8a04..9bc44d8 100755
--- a/bin/start-here.sh
+++ b/bin/start-here.sh
@@ -47,7 +47,7 @@ done
 
 for host in $HOSTS
 do
-    if [ ${host} = ${GC} ]
+    if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/slaves
     then
 	${bin}/start-server.sh $GC gc "garbage collector"
 	break

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4976a935/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index a717e42..4afc36a 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -42,7 +42,10 @@ do
       ${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
    done
 
-   ${bin}/stop-server.sh $GC "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
+   for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+   do
+      ${bin}/stop-server.sh $gc "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
+   done
 
    ${bin}/stop-server.sh $MONITOR "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 


[2/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters

Posted by ec...@apache.org.
ACCUMULO-1901 treat the gc start/stop like the redundant masters


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: ffb26a25ffc94d28a9e1de93054ed5a8590cb943
Parents: 4976a93
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:01:46 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:01:46 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-here.sh | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffb26a25/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 2d9e6fe..5836b46 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,6 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 
@@ -121,11 +120,7 @@ then
     fi
 fi
 MASTER1=`grep -v '^#' "$ACCUMULO_CONF_DIR/masters" | head -1`
-GC=$MASTER1
 MONITOR=$MASTER1
-if [ -f "$ACCUMULO_CONF_DIR/gc" ]; then
-    GC=`grep -v '^#' "$ACCUMULO_CONF_DIR/gc" | head -1`
-fi
 if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
     MONITOR=`grep -v '^#' "$ACCUMULO_CONF_DIR/monitor" | head -1`
 fi

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffb26a25/bin/start-here.sh
----------------------------------------------------------------------
diff --git a/bin/start-here.sh b/bin/start-here.sh
index 9bc44d8..990fb1c 100755
--- a/bin/start-here.sh
+++ b/bin/start-here.sh
@@ -47,9 +47,9 @@ done
 
 for host in $HOSTS
 do
-    if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/slaves
+    if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/gc
     then
-	${bin}/start-server.sh $GC gc "garbage collector"
+	${bin}/start-server.sh $host gc "garbage collector"
 	break
     fi
 done


[6/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters

Posted by ec...@apache.org.
ACCUMULO-1901 treat the gc start/stop like the redundant masters


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6f07d7aaacaa93ce8dbcb1747bc1bccdfade008b
Parents: bf8c90a
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:31:38 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:31:38 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 5f560e3..d43f4af 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,6 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 #  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
@@ -95,11 +94,7 @@ fi
 export HADOOP_PREFIX
 
 MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
-GC=$MASTER1
 MONITOR=$MASTER1
-if [ -f "$ACCUMULO_CONF_DIR/gc" ]; then
-   GC=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc" | head -1)
-fi
 if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
    MONITOR=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/monitor" | head -1)
 fi

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 8470a40..5b15d86 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -58,7 +58,9 @@ for master in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters"`; do
    ${bin}/start-server.sh $master master
 done
 
-${bin}/start-server.sh $GC gc "garbage collector"
+for gc in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc"`; do
+   ${bin}/start-server.sh $gc gc "garbage collector"
+done
 
 for tracer in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/tracers"`; do
    ${bin}/start-server.sh $tracer tracer

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-here.sh
----------------------------------------------------------------------
diff --git a/bin/start-here.sh b/bin/start-here.sh
index 2952975..29f901d 100755
--- a/bin/start-here.sh
+++ b/bin/start-here.sh
@@ -57,8 +57,8 @@ for host in $HOSTS; do
 done
 
 for host in $HOSTS; do
-   if [ ${host} = "${GC}" ]; then
-      ${bin}/start-server.sh $GC gc "garbage collector"
+   if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/gc; then
+      ${bin}/start-server.sh $host gc "garbage collector"
       break
    fi
 done

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 348d067..bf5b20d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -45,10 +45,12 @@ sleep 5
 #look for master and gc processes not killed by 'admin stopAll'
 for signal in TERM KILL ; do
    for master in `grep -v '^#' "$ACCUMULO_CONF_DIR/masters"`; do
-      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.jar" master $signal
+      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.*.jar" master $signal
    done
 
-   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/lib/accumulo-start.jar" gc $signal
+   for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`; do
+      ${bin}/stop-server.sh "$gc" "$ACCUMULO_HOME/lib/accumulo-start.*.jar" gc $signal
+   done
 
    ${bin}/stop-server.sh "$MONITOR" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 


[4/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters

Posted by ec...@apache.org.
ACCUMULO-1901 treat the gc start/stop like the redundant masters


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6f07d7aaacaa93ce8dbcb1747bc1bccdfade008b
Parents: bf8c90a
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:31:38 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:31:38 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 5f560e3..d43f4af 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,6 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 #  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
@@ -95,11 +94,7 @@ fi
 export HADOOP_PREFIX
 
 MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
-GC=$MASTER1
 MONITOR=$MASTER1
-if [ -f "$ACCUMULO_CONF_DIR/gc" ]; then
-   GC=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc" | head -1)
-fi
 if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
    MONITOR=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/monitor" | head -1)
 fi

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 8470a40..5b15d86 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -58,7 +58,9 @@ for master in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters"`; do
    ${bin}/start-server.sh $master master
 done
 
-${bin}/start-server.sh $GC gc "garbage collector"
+for gc in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc"`; do
+   ${bin}/start-server.sh $gc gc "garbage collector"
+done
 
 for tracer in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/tracers"`; do
    ${bin}/start-server.sh $tracer tracer

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-here.sh
----------------------------------------------------------------------
diff --git a/bin/start-here.sh b/bin/start-here.sh
index 2952975..29f901d 100755
--- a/bin/start-here.sh
+++ b/bin/start-here.sh
@@ -57,8 +57,8 @@ for host in $HOSTS; do
 done
 
 for host in $HOSTS; do
-   if [ ${host} = "${GC}" ]; then
-      ${bin}/start-server.sh $GC gc "garbage collector"
+   if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/gc; then
+      ${bin}/start-server.sh $host gc "garbage collector"
       break
    fi
 done

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 348d067..bf5b20d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -45,10 +45,12 @@ sleep 5
 #look for master and gc processes not killed by 'admin stopAll'
 for signal in TERM KILL ; do
    for master in `grep -v '^#' "$ACCUMULO_CONF_DIR/masters"`; do
-      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.jar" master $signal
+      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.*.jar" master $signal
    done
 
-   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/lib/accumulo-start.jar" gc $signal
+   for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`; do
+      ${bin}/stop-server.sh "$gc" "$ACCUMULO_HOME/lib/accumulo-start.*.jar" gc $signal
+   done
 
    ${bin}/stop-server.sh "$MONITOR" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 


[9/9] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by ec...@apache.org.
Merge branch '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/4ba65875
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4ba65875
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4ba65875

Branch: refs/heads/master
Commit: 4ba6587505223a446477901d81abd34741b95012
Parents: 1af6323 3875de3
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:32:07 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:32:07 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------



[5/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters

Posted by ec...@apache.org.
ACCUMULO-1901 treat the gc start/stop like the redundant masters


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

Branch: refs/heads/master
Commit: 6f07d7aaacaa93ce8dbcb1747bc1bccdfade008b
Parents: bf8c90a
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:31:38 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:31:38 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 5f560e3..d43f4af 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -26,7 +26,6 @@
 # 
 # Values always set by script.
 #  MALLOC_ARENA_MAX   To work around a memory management bug (see ACCUMULO-847)
-#  GC                 Machine to run GC daemon on.  Used by start-here.sh script
 #  MONITOR            Machine to run monitor daemon on. Used by start-here.sh script
 #  SSH                Default ssh parameters used to start daemons
 #  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
@@ -95,11 +94,7 @@ fi
 export HADOOP_PREFIX
 
 MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
-GC=$MASTER1
 MONITOR=$MASTER1
-if [ -f "$ACCUMULO_CONF_DIR/gc" ]; then
-   GC=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc" | head -1)
-fi
 if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
    MONITOR=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/monitor" | head -1)
 fi

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 8470a40..5b15d86 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -58,7 +58,9 @@ for master in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters"`; do
    ${bin}/start-server.sh $master master
 done
 
-${bin}/start-server.sh $GC gc "garbage collector"
+for gc in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc"`; do
+   ${bin}/start-server.sh $gc gc "garbage collector"
+done
 
 for tracer in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/tracers"`; do
    ${bin}/start-server.sh $tracer tracer

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-here.sh
----------------------------------------------------------------------
diff --git a/bin/start-here.sh b/bin/start-here.sh
index 2952975..29f901d 100755
--- a/bin/start-here.sh
+++ b/bin/start-here.sh
@@ -57,8 +57,8 @@ for host in $HOSTS; do
 done
 
 for host in $HOSTS; do
-   if [ ${host} = "${GC}" ]; then
-      ${bin}/start-server.sh $GC gc "garbage collector"
+   if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/gc; then
+      ${bin}/start-server.sh $host gc "garbage collector"
       break
    fi
 done

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 348d067..bf5b20d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -45,10 +45,12 @@ sleep 5
 #look for master and gc processes not killed by 'admin stopAll'
 for signal in TERM KILL ; do
    for master in `grep -v '^#' "$ACCUMULO_CONF_DIR/masters"`; do
-      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.jar" master $signal
+      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.*.jar" master $signal
    done
 
-   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/lib/accumulo-start.jar" gc $signal
+   for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`; do
+      ${bin}/stop-server.sh "$gc" "$ACCUMULO_HOME/lib/accumulo-start.*.jar" gc $signal
+   done
 
    ${bin}/stop-server.sh "$MONITOR" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 


[7/9] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by ec...@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/3875de36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3875de36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3875de36

Branch: refs/heads/master
Commit: 3875de36728098382a7fa55fa839cef35173bdf0
Parents: 55016d7 6f07d7a
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:31:53 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:31:53 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/config.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/start-all.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/start-here.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/stop-all.sh
----------------------------------------------------------------------


[3/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters

Posted by ec...@apache.org.
ACCUMULO-1901 treat the gc start/stop like the redundant masters


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: d8b4ba9424d5cb7b2f1260f63386b2c7f478b306
Parents: ffb26a2
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:27:35 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:27:35 2013 -0500

----------------------------------------------------------------------
 bin/start-all.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d8b4ba94/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 5bee329..278e7b9 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -52,7 +52,10 @@ do
     ${bin}/start-server.sh $master master
 done
 
-${bin}/start-server.sh $GC gc "garbage collector"
+for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+do
+    ${bin}/start-server.sh $gc gc "garbage collector"
+done
 
 ${bin}/start-server.sh $MONITOR monitor 
 


[8/9] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by ec...@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/3875de36
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3875de36
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3875de36

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3875de36728098382a7fa55fa839cef35173bdf0
Parents: 55016d7 6f07d7a
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 11:31:53 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 11:31:53 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/config.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/start-all.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/start-here.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3875de36/bin/stop-all.sh
----------------------------------------------------------------------