Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1bf41ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1bf41ec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1bf41ec Branch: refs/heads/1.6 Commit: b1bf41ec9aefde6340f1643f3dadc19e7ce85748 Parents: 0abfa27 cabf265 Author: Josh Elser <[email protected]> Authored: Mon Dec 15 11:43:57 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Mon Dec 15 11:43:57 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/monitor/Monitor.java | 4 +- .../monitor/servlets/MasterServlet.java | 2 + .../monitor/servlets/PreciseNumberType.java | 39 ------------------ .../accumulo/monitor/servlets/ScanServlet.java | 16 ++++---- .../util/celltypes/PreciseNumberType.java | 42 ++++++++++++++++++++ .../util/celltypes/PreciseNumberTypeTest.java | 4 +- 6 files changed, 55 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
