Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/37786f3d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/37786f3d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/37786f3d Branch: refs/heads/master Commit: 37786f3d54ce1785f6003cd1448b1214593c7078 Parents: 78187c1 39d3c78 Author: Josh Elser <els...@apache.org> Authored: Tue Nov 4 17:15:39 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Nov 4 17:15:39 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/tserver/ConditionalMutationSet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
