Merge branch '1.6' into 1.7
Conflicts:
assemble/pom.xml
core/pom.xml
docs/pom.xml
examples/simple/pom.xml
fate/pom.xml
maven-plugin/pom.xml
minicluster/pom.xml
pom.xml
proxy/pom.xml
server/base/pom.xml
server/gc/pom.xml
server/master/pom.xml
server/monitor/pom.xml
server/native/pom.xml
server/tracer/pom.xml
server/tserver/pom.xml
start/pom.xml
test/pom.xml
trace/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/09ddfd44
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/09ddfd44
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/09ddfd44
Branch: refs/heads/master
Commit: 09ddfd4498ddefcec4802aaffa4b3f15bf088889
Parents: a7e45df a75c685
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Feb 17 15:56:17 2016 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Feb 17 15:56:17 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
