Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c2652b2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c2652b2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c2652b2
Branch: refs/heads/master
Commit: 4c2652b233e3cba9c7c1ca3e82eb2898278b5a1d
Parents: 2654ba5 652b5af
Author: Josh Elser <josh.el...@gmail.com>
Authored: Fri Jan 3 15:32:58 2014 -0500
Committer: Josh Elser <josh.el...@gmail.com>
Committed: Fri Jan 3 15:32:58 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
