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/139f489c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/139f489c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/139f489c Branch: refs/heads/master Commit: 139f489cad4afc3773f81b919d57010dc72db6d1 Parents: 8a8d674 0e136c1 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Nov 13 06:45:12 2015 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Nov 13 06:45:12 2015 -0500 ---------------------------------------------------------------------- assemble/bin/bootstrap_config.sh | 29 ++++++++++++- assemble/conf/templates/accumulo-site.xml | 9 ++++ .../org/apache/accumulo/core/conf/Property.java | 11 +++-- .../iterators/system/TimeSettingIterator.java | 2 +- .../system/TimeSettingIteratorTest.java | 31 ++++++++++++-- .../master/balancer/ChaoticLoadBalancer.java | 17 ++++++++ .../accumulo/gc/GarbageCollectionAlgorithm.java | 5 +-- .../org/apache/accumulo/monitor/Monitor.java | 3 -- .../apache/accumulo/tserver/TabletServer.java | 16 +++++-- .../tserver/log/TabletServerLogger.java | 44 +++++++++++++++----- .../accumulo/test/TabletServerGivesUpIT.java | 2 + 11 files changed, 141 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
