Merge branch '1.6.1-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/49b1f08c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49b1f08c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49b1f08c
Branch: refs/heads/ACCUMULO-378
Commit: 49b1f08c3fd711d021758841e5556b06e93cc931
Parents: 1dae029 4d5ba9d
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Fri May 2 18:38:51 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Fri May 2 18:38:51 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
