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/bc53d3a4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc53d3a4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc53d3a4
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: bc53d3a4be7466524f9106d9b97399d6f6ba2119
Parents: 939ed96 019ff0a
Author: Josh Elser <els...@apache.org>
Authored: Mon Sep 15 11:17:47 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Mon Sep 15 11:17:47 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
