You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/04 18:48:08 UTC
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/ca61fe81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca61fe81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca61fe81
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ca61fe814db20da7d532259847cfeccc0b2a4204
Parents: 9ff2c45 9abf942
Author: Eric Newton <er...@gmail.com>
Authored: Tue Mar 4 12:46:55 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Mar 4 12:46:55 2014 -0500
----------------------------------------------------------------------
.../apache/accumulo/fate/zookeeper/ZooLock.java | 43 +++++++++++++----
.../java/org/apache/accumulo/master/Master.java | 1 +
.../test/continuous/ContinuousBatchWalker.java | 2 +-
.../test/continuous/ContinuousIngest.java | 9 ++--
.../test/continuous/ContinuousQuery.java | 2 +-
.../test/continuous/ContinuousScanner.java | 2 +-
.../test/continuous/ContinuousUtil.java | 49 ++++++++++++++++++++
.../test/continuous/ContinuousWalk.java | 2 +-
8 files changed, 91 insertions(+), 19 deletions(-)
----------------------------------------------------------------------