Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/949eebbb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/949eebbb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/949eebbb Branch: refs/heads/ACCUMULO-378 Commit: 949eebbba10cad5be40f539af72037a7d9109c94 Parents: aa4746d 204bcfe Author: Josh Elser <els...@apache.org> Authored: Thu Jun 5 16:09:32 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 5 16:09:32 2014 -0400 ---------------------------------------------------------------------- pom.xml | 7 +++++++ .../main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +- .../main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/949eebbb/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/949eebbb/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ----------------------------------------------------------------------
