Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ec25dbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ec25dbe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ec25dbe Branch: refs/heads/master Commit: 3ec25dbe5e9a70fd8ce2ebeecc0627d06cae1e2b Parents: 5bb28ed 2d97b87 Author: Eric Newton <[email protected]> Authored: Wed Dec 18 09:50:17 2013 -0500 Committer: Eric Newton <[email protected]> Committed: Wed Dec 18 09:50:17 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/data/Key.java | 13 ++ .../org/apache/accumulo/core/data/Mutation.java | 7 + .../org/apache/accumulo/core/data/KeyTest.java | 30 +++- .../apache/accumulo/core/data/MutationTest.java | 143 ++++++++++++------- .../apache/accumulo/core/data/OldMutation.java | 7 + 5 files changed, 143 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ec25dbe/core/src/main/java/org/apache/accumulo/core/data/Mutation.java ----------------------------------------------------------------------
