accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Fri, 07 Feb 2014 17:55:32 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java


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

Branch: refs/heads/master
Commit: db42aba0215e5698b82bce057d4027dda586b9d5
Parents: dea61a0 19e6b10
Author: Josh Elser <elserj@apache.org>
Authored: Fri Feb 7 12:54:44 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Feb 7 12:54:44 2014 -0500

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

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



Mime
View raw message