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/11/06 23:21:19 UTC

[4/4] 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:
	test/system/auto/README


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7a83c145b47f323680abbf9f237f5838330c2731
Parents: aa26200 b0ec17d
Author: Josh Elser <el...@apache.org>
Authored: Wed Nov 6 17:18:39 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 6 17:18:39 2013 -0500

----------------------------------------------------------------------
 README | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a83c145/README
----------------------------------------------------------------------