Merge branch '1.6.2-SNAPSHOT'
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/72dd8e16
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72dd8e16
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72dd8e16
Branch: refs/heads/master
Commit: 72dd8e16cb9ae1c6e644631c06c26d1794ba12ef
Parents: 575060a ecb5b54
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Sep 25 20:57:51 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Sep 25 20:57:51 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
