accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.5.1-SNAPSHOT'
Date Thu, 17 Oct 2013 23:14:17 GMT
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java

Merging ACCUMULO-1786 is a no-op because of ACCUMULO-1664. Processes are
able to use random ports and MAC already does in 1.6.0-SNAPSHOT, so
there's no need to do anything special in the test.


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

Branch: refs/heads/master
Commit: 5480ae0f1a040a39a7ac51336dd94fb3122c8863
Parents: 8f6bc5b 109db35
Author: Josh Elser <elserj@apache.org>
Authored: Thu Oct 17 19:10:03 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Oct 17 19:10:03 2013 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message