Merge branch '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/0a0ab325 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0ab325 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a0ab325 Branch: refs/heads/master Commit: 0a0ab3250ecadd29400c8a4642761a4bdcd0d3e0 Parents: 31c8b5a b0d056e Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Nov 7 13:49:57 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Nov 7 13:49:57 2013 -0500 ---------------------------------------------------------------------- .../core/client/impl/ConditionalWriterImpl.java | 3 ++- .../accumulo/test/randomwalk/conditional/Transfer.java | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
