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/eca6022f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eca6022f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eca6022f Branch: refs/heads/master Commit: eca6022f823d264bd4cf60f3f6ef8ae86cb98ae7 Parents: 0c51290 09a4f0a Author: Josh Elser <els...@apache.org> Authored: Fri Oct 31 18:45:19 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Oct 31 18:45:19 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ConditionalWriterIT.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/eca6022f/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ----------------------------------------------------------------------
