Merge branch '1.6' into 1.7
Conflicts:
proxy/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84ccd5ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/84ccd5ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/84ccd5ce
Branch: refs/heads/1.7
Commit: 84ccd5ce320da6da982987ec81ac5c587ad49614
Parents: 9e08255 b7fcc2f
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu May 28 14:17:13 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu May 28 14:17:13 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
