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/660429f2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/660429f2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/660429f2
Branch: refs/heads/master
Commit: 660429f2ed4fcda1b9ffd99c280ac8bed0375bff
Parents: 07bacc3 f870d51
Author: Josh Elser <els...@apache.org>
Authored: Mon Aug 11 12:09:44 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Mon Aug 11 12:09:44 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
