You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/06/20 23:50:07 UTC

[15/23] accumulo git commit: Merge branch '1.7' into 1.8

Merge branch '1.7' into 1.8

Conflicts:
	server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24844cc2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24844cc2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24844cc2

Branch: refs/heads/1.8
Commit: 24844cc2c2409986e9ef0f4d7b7a543b1121cb3a
Parents: 519e5b7 976c0aa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:23:51 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:23:51 2016 -0400

----------------------------------------------------------------------
 pom.xml                                                       | 2 +-
 .../master/balancer/BaseHostRegexTableLoadBalancerTest.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------