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/08/06 17:47:29 UTC

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	CHANGES


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

Branch: refs/heads/master
Commit: b54df781704e44ad8410a4d23a226463527d2d7c
Parents: 4f082cf 139bd83
Author: Josh Elser <el...@apache.org>
Authored: Wed Aug 6 11:45:48 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Aug 6 11:45:48 2014 -0400

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

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