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 2016/08/26 15:54:04 UTC
[5/9] accumulo git commit: Merge remote-tracking branch 'origin/1.7'
into 1.8
Merge remote-tracking branch 'origin/1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e29055f4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e29055f4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e29055f4
Branch: refs/heads/1.8
Commit: e29055f4624820e83b10879af1c19569f9115ed1
Parents: 271800c 371db68
Author: Josh Elser <el...@apache.org>
Authored: Fri Aug 26 10:54:16 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Aug 26 10:54:16 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------