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 2014/10/10 00:47:23 UTC

[06/10] git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java


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

Branch: refs/heads/master
Commit: 3d7d762ac8d088bfa164bdc8523c3e1aa9b6dbc7
Parents: 76de760 854dce9
Author: Josh Elser <el...@apache.org>
Authored: Thu Oct 9 18:09:48 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Oct 9 18:09:48 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/data/Key.java | 14 +--
 .../org/apache/accumulo/core/data/KeyValue.java | 72 ++++++++-------
 .../org/apache/accumulo/tserver/Tablet.java     | 13 ++-
 .../apache/accumulo/tserver/TabletServer.java   |  2 +-
 .../accumulo/test/KeyValueEqualityTest.java     | 94 ++++++++++++++++++++
 5 files changed, 145 insertions(+), 50 deletions(-)
----------------------------------------------------------------------