Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f478737a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f478737a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f478737a
Branch: refs/heads/master
Commit: f478737a13a76ec1ec3c96f160c101f50ba04f03
Parents: fd652ca f896c95
Author: Josh Elser <els...@apache.org>
Authored: Mon Nov 25 16:43:58 2013 -0500
Committer: Josh Elser <els...@apache.org>
Committed: Mon Nov 25 16:43:58 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
