Merge branch '1.5' into 1.6
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ef27593
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ef27593
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ef27593
Branch: refs/heads/master
Commit: 1ef27593b44919a61e2d70328d93718d20669661
Parents: ec6c0df 0b0e8eb
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Jun 10 15:24:20 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Jun 10 15:24:20 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
