Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/635f5403 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/635f5403 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/635f5403 Branch: refs/heads/master Commit: 635f54030df0999a46a2337aa2d95abcc85904d9 Parents: 3592b38 eff4547 Author: Sean Busbey <bus...@cloudera.com> Authored: Wed Jun 8 16:42:36 2016 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Wed Jun 8 16:42:36 2016 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 2 +- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../java/org/apache/accumulo/tserver/log/TabletServerLogger.java | 2 +- .../java/org/apache/accumulo/tserver/scan/NextBatchTask.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/635f5403/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ----------------------------------------------------------------------
