Merge branch '1.6'
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/678a3785
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/678a3785
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/678a3785
Branch: refs/heads/master
Commit: 678a3785232338fd4b208d0cb21d3ead34835aea
Parents: d5745da d859e2a
Author: Corey J. Nolet <cjno...@gmail.com>
Authored: Mon Feb 16 09:48:35 2015 -0500
Committer: Corey J. Nolet <cjno...@gmail.com>
Committed: Mon Feb 16 09:48:35 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
