accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [4/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Date Wed, 19 Feb 2014 22:25:01 GMT
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/206ee551
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/206ee551
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/206ee551

Branch: refs/heads/master
Commit: 206ee55160f42cc8ff6cb830393891b20cd02070
Parents: 294fe25 dcc19cc
Author: Eric Newton <eric.newton@gmail.com>
Authored: Wed Feb 19 17:25:17 2014 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Wed Feb 19 17:25:17 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/Instance.java   |  36 +++---
 .../org/apache/accumulo/core/conf/Property.java |  87 +++++++-------
 .../accumulo/core/util/ValidatorTest.java       |   6 +-
 .../java/org/apache/accumulo/fate/Fate.java     |  67 ++++++-----
 .../server/master/state/ClosableIterator.java   |  23 ++++
 .../server/master/state/MetaDataStateStore.java |   3 +-
 .../master/state/MetaDataTableScanner.java      |   2 +-
 .../master/state/RootTabletStateStore.java      |   4 +-
 .../server/master/state/TabletStateStore.java   |   3 +-
 .../master/state/ZooTabletStateStore.java       |   8 +-
 .../server/watcher/MonitorLog4jWatcher.java     |  10 +-
 .../server/zookeeper/DistributedWorkQueue.java  |   2 +-
 .../accumulo/master/TabletGroupWatcher.java     |  15 ++-
 .../tserver/log/TabletServerLogger.java         | 112 ++++++++++---------
 .../tserver/TabletResourceManagerTest.java      |   8 +-
 15 files changed, 206 insertions(+), 180 deletions(-)
----------------------------------------------------------------------



Mime
View raw message