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/91bca47f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91bca47f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91bca47f Branch: refs/heads/master Commit: 91bca47f748036538018e3a1fba1c00dddd74a0f Parents: 495d7ae 51f84de Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 3 10:13:31 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 3 10:13:31 2014 -0500 ---------------------------------------------------------------------- .../accumulo/test/ConditionalWriterIT.java | 62 +++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
