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 2013/10/15 20:28:18 UTC

[3/3] git commit: Merge branch '1.5.1-SNAPSHOT'

Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	test/system/auto/simple/zooCacheTest.py


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

Branch: refs/heads/master
Commit: 5413543ae2aa3c02d6a2f98c9dd7183fb7016c60
Parents: 876c5ce 1b05bd8
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 15 14:27:50 2013 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Oct 15 14:27:50 2013 -0400

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

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