Merge branch '1.6' into 1.7
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a6bf35ab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a6bf35ab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a6bf35ab
Branch: refs/heads/master
Commit: a6bf35ab4933678b9133c2603818d9bd712869e0
Parents: 50f8a79 7c070bf
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Jun 10 15:32:59 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Jun 10 15:32:59 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
