Merge branch '1.7'
Conflicts:
assemble/bin/start-server.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9d917389
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9d917389
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9d917389
Branch: refs/heads/master
Commit: 9d91738938ebe4068169a52d1aff8abdff90f6c8
Parents: 7f4cb62 a25ec8e
Author: Keith Turner <ktur...@apache.org>
Authored: Wed Dec 30 10:27:10 2015 -0500
Committer: Keith Turner <ktur...@apache.org>
Committed: Wed Dec 30 10:27:10 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
