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/2ab616a6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ab616a6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2ab616a6 Branch: refs/heads/master Commit: 2ab616a6427f7771a957131747a9f17f3e71003e Parents: 6166406 c5197aa Author: Josh Elser <els...@apache.org> Authored: Fri Nov 21 16:43:09 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Nov 21 16:43:09 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/ConditionalWriterIT.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ab616a6/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ----------------------------------------------------------------------
