accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Fri, 03 Jan 2014 20:33:40 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	pom.xml


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4c2652b233e3cba9c7c1ca3e82eb2898278b5a1d
Parents: 2654ba5 652b5af
Author: Josh Elser <josh.elser@gmail.com>
Authored: Fri Jan 3 15:32:58 2014 -0500
Committer: Josh Elser <josh.elser@gmail.com>
Committed: Fri Jan 3 15:32:58 2014 -0500

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

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



Mime
View raw message