Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ac95b6c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ac95b6c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ac95b6c Branch: refs/heads/master Commit: 1ac95b6c6ea0a09cc34eaa8d42a1fa2f5d60d49f Parents: 7c1d58a a11b28b Author: Keith Turner <ktur...@apache.org> Authored: Fri Jul 22 16:17:43 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Jul 22 16:17:43 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/server/ServerConstants.java | 8 +++++-- .../accumulo/server/log/WalStateManager.java | 19 +++++++++++++-- .../java/org/apache/accumulo/master/Master.java | 4 ++++ test/system/upgrade_test.sh | 25 ++++++++++---------- 4 files changed, 40 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ac95b6c/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
