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/5abb916f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5abb916f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5abb916f Branch: refs/heads/master Commit: 5abb916fc45a6608849d6bf2cb26cbf7b232b82d Parents: ca2d4eb 0f3b4ca Author: Keith Turner <ktur...@apache.org> Authored: Fri Apr 18 17:56:47 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Apr 18 17:56:47 2014 -0400 ---------------------------------------------------------------------- .../core/client/impl/ConditionalWriterImpl.java | 21 ++++++++------------ .../test/randomwalk/conditional/Init.java | 7 ++++++- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5abb916f/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java ----------------------------------------------------------------------
