Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/560c2688 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560c2688 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/560c2688 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 560c268828417498e04b135bff4994c35efe2539 Parents: a9ea7a9 c335fca Author: Josh Elser <els...@apache.org> Authored: Wed Sep 10 23:15:52 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Wed Sep 10 23:15:52 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
