Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51f39d29 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51f39d29 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51f39d29 Branch: refs/heads/master Commit: 51f39d292eb0aec15007fdd49fbf709792a3a2a7 Parents: d0a0ac0 55981ad Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Apr 24 19:06:05 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Apr 24 19:06:05 2015 -0400 ---------------------------------------------------------------------- .../base/src/main/java/org/apache/accumulo/server/TabletLevel.java | 2 +- .../accumulo/gc/replication/CloseWriteAheadLogReferencesTest.java | 1 - .../test/java/org/apache/accumulo/tserver/log/LogEntryTest.java | 2 +- .../apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java | 2 +- .../java/org/apache/accumulo/test/functional/WALSunnyDayIT.java | 2 +- .../java/org/apache/accumulo/test/replication/ReplicationIT.java | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
