Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b7a14eb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b7a14eb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b7a14eb Branch: refs/heads/master Commit: 5b7a14eb51d66b24f1b3d3a8cf6f45f71eb02e4a Parents: 6760c5c f830300 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed May 6 18:55:33 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed May 6 18:55:33 2015 -0400 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/data/Mutation.java | 3 ++- .../org/apache/accumulo/server/fs/PreferredVolumeChooser.java | 5 ++++- .../java/org/apache/accumulo/server/replication/StatusUtil.java | 2 +- .../master/replication/RemoveCompleteReplicationRecords.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
