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/6239604c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6239604c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6239604c Branch: refs/heads/master Commit: 6239604c19a789d81d0b964e31018b4067900364 Parents: 8f87c72 5d7f6a9 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Nov 5 13:44:15 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 5 13:44:15 2013 -0500 ---------------------------------------------------------------------- .../core/client/admin/TableOperationsImpl.java | 6 +- .../core/tabletserver/log/LogEntry.java | 36 ++++ .../core/util/shell/commands/OnlineCommand.java | 6 +- server/base/pom.xml | 10 +- .../master/state/MetaDataTableScanner.java | 4 +- .../master/state/ZooTabletStateStore.java | 6 +- .../accumulo/server/util/MetadataTableUtil.java | 79 +------ .../server/util/OfflineMetadataScanner.java | 2 +- .../apache/accumulo/utils/NamespaceRename.java | 211 +++++++++++++++++++ .../gc/GarbageCollectWriteAheadLogs.java | 3 +- .../java/org/apache/accumulo/master/Master.java | 10 +- .../accumulo/master/TabletGroupWatcher.java | 2 +- .../org/apache/accumulo/tserver/Tablet.java | 4 +- .../apache/accumulo/tserver/TabletServer.java | 4 +- 14 files changed, 283 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6239604c/server/base/pom.xml ----------------------------------------------------------------------
