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 Mon, 10 Feb 2014 21:01:42 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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


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

Branch: refs/heads/master
Commit: 2d42417d76b2d115d83f204ac4d790023f29459f
Parents: 1f37513 24c0445
Author: Josh Elser <elserj@apache.org>
Authored: Mon Feb 10 16:01:05 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Feb 10 16:01:05 2014 -0500

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

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



Mime
View raw message