Merge tag '1.5.3' into 1.6
(no changes)
Conflicts:
assemble/pom.xml
core/pom.xml
examples/pom.xml
examples/simple/pom.xml
fate/pom.xml
minicluster/pom.xml
pom.xml
proxy/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/32baa4ab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32baa4ab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32baa4ab
Branch: refs/heads/1.7
Commit: 32baa4ab371272dbda6ec110a23a42634cf30059
Parents: 18d68fc 9009d48
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Jun 25 11:50:43 2015 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Jun 25 11:50:43 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
