You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by bu...@apache.org on 2014/01/23 08:36:41 UTC

[23/23] git commit: Merge branch '1.6.0-SNAPSHOT'

Merge branch '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/353badb0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/353badb0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/353badb0

Branch: refs/heads/master
Commit: 353badb056681d0ea014810af68128c849070743
Parents: bfe39f6 e7e5c00
Author: Sean Busbey <bu...@cloudera.com>
Authored: Thu Jan 23 01:26:44 2014 -0600
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Thu Jan 23 01:26:44 2014 -0600

----------------------------------------------------------------------
 .../apache/accumulo/core/util/AddressUtil.java  |  2 +-
 .../apache/accumulo/core/zookeeper/ZooUtil.java | 10 ++-
 .../apache/accumulo/fate/util/AddressUtil.java  | 60 +++++++++++++
 .../accumulo/fate/zookeeper/ZooSession.java     | 14 +--
 .../accumulo/fate/util/AddressUtilTest.java     | 95 ++++++++++++++++++++
 .../org/apache/accumulo/server/Accumulo.java    | 22 ++++-
 .../accumulo/server/fs/VolumeManagerImpl.java   |  3 +
 .../accumulo/server/util/TabletOperations.java  | 10 ++-
 .../accumulo/master/tableOps/DeleteTable.java   |  8 ++
 .../org/apache/accumulo/tracer/TraceServer.java | 67 ++++++++++----
 .../org/apache/accumulo/tserver/Compactor.java  |  2 +
 11 files changed, 264 insertions(+), 29 deletions(-)
----------------------------------------------------------------------