Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fed5dd50 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fed5dd50 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fed5dd50 Branch: refs/heads/master Commit: fed5dd50aecb9e7b602e0208ef6fae706b0b2619 Parents: d75e963 7a6b482 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Feb 1 12:30:52 2016 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Feb 1 12:30:52 2016 -0500 ---------------------------------------------------------------------- .gitignore | 3 + assemble/.gitignore | 3 + assemble/pom.xml | 3 + core/.gitignore | 3 + core/pom.xml | 3 + .../core/client/impl/CompressedIterators.java | 14 +- .../core/client/impl/ConditionalWriterImpl.java | 46 +++++- .../accumulo/core/iterators/IteratorUtil.java | 89 +++++----- .../client/impl/ConditionalComparatorTest.java | 53 ++++++ docs/.gitignore | 3 + examples/simple/.gitignore | 3 + examples/simple/pom.xml | 3 + fate/.gitignore | 3 + maven-plugin/.gitignore | 3 + minicluster/.gitignore | 3 + pom.xml | 12 ++ proxy/.gitignore | 3 + server/base/.gitignore | 3 + server/gc/.gitignore | 3 + server/master/.gitignore | 3 + server/monitor/.gitignore | 3 + server/monitor/pom.xml | 3 + server/native/.gitignore | 3 + server/tracer/.gitignore | 3 + server/tserver/.gitignore | 3 + server/tserver/pom.xml | 3 + .../tserver/ConditionCheckerContext.java | 164 +++++++++++++++++++ .../apache/accumulo/tserver/TabletServer.java | 79 +++------ .../accumulo/tserver/tablet/ScanDataSource.java | 19 ++- .../apache/accumulo/tserver/tablet/Tablet.java | 18 ++ shell/.gitignore | 4 +- shell/pom.xml | 17 ++ start/.gitignore | 4 +- test/.gitignore | 4 + test/pom.xml | 3 + .../accumulo/test/ConditionalWriterIT.java | 139 +++++++++++++++- trace/.gitignore | 3 + 37 files changed, 614 insertions(+), 117 deletions(-) ----------------------------------------------------------------------
