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/86a26fe6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/86a26fe6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/86a26fe6 Branch: refs/heads/master Commit: 86a26fe6716974fc046fec6a0324fe65c367c35c Parents: abb4f91 a573f96 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 3 12:25:19 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 3 12:25:19 2014 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
