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/2f934093 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2f934093 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2f934093 Branch: refs/heads/master Commit: 2f9340932b414b1cc2bf57727399940b8239b2e6 Parents: a2e4d7c b7b55eb Author: Josh Elser <els...@apache.org> Authored: Wed Nov 5 15:27:32 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Nov 5 15:27:32 2014 -0500 ---------------------------------------------------------------------- .../core/client/impl/TableOperationsImpl.java | 21 +++-- .../client/impl/TableOperationsImplTest.java | 86 ++++++++++++++++++++ .../accumulo/test/ConditionalWriterIT.java | 4 - 3 files changed, 102 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2f934093/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2f934093/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java ----------------------------------------------------------------------
