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:27 UTC
[10/10] git commit: Merge branch '1.6'
Merge branch '1.6'
Conflicts:
core/src/main/java/org/apache/accumulo/core/data/Key.java
core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/837ce17c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/837ce17c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/837ce17c
Branch: refs/heads/master
Commit: 837ce17c876234cac4e9fb3c09126dff20dee665
Parents: a59e22c 3d7d762
Author: Josh Elser <el...@apache.org>
Authored: Thu Oct 9 18:46:42 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Oct 9 18:46:42 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/data/Key.java | 6 +-
.../org/apache/accumulo/core/data/KeyValue.java | 6 +-
.../accumulo/test/KeyValueEqualityTest.java | 94 ++++++++++++++++++++
3 files changed, 100 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/837ce17c/core/src/main/java/org/apache/accumulo/core/data/Key.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/837ce17c/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
----------------------------------------------------------------------