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

Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/03 21:33:40 UTC

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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 <jo...@gmail.com>
Authored: Fri Jan 3 15:32:58 2014 -0500
Committer: Josh Elser <jo...@gmail.com>
Committed: Fri Jan 3 15:32:58 2014 -0500

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

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