Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
server/src/main/java/org/apache/accumulo/server/master/Master.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a63e7c9b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a63e7c9b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a63e7c9b
Branch: refs/heads/ACCUMULO-2061
Commit: a63e7c9b9767c0585956616597385f32463be688
Parents: 0297276 12b53b0
Author: Josh Elser <els...@apache.org>
Authored: Sun Mar 9 23:49:47 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Sun Mar 9 23:49:47 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
