Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6592bb12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6592bb12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6592bb12 Branch: refs/heads/master Commit: 6592bb122fb7ab827bca5c540e9969f4c1176015 Parents: e2856a4 73b4fbb Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue May 10 19:53:47 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue May 10 19:53:47 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/ScannerBase.java | 2 -- .../accumulo/core/client/ZooKeeperInstance.java | 1 - .../core/client/mapred/InputFormatBase.java | 1 - .../core/client/mapreduce/InputFormatBase.java | 1 - .../core/client/mapreduce/InputTableConfig.java | 1 - .../mapreduce/lib/impl/InputConfigurator.java | 1 - .../mapreduce/lib/util/InputConfigurator.java | 1 - .../accumulo/core/constraints/Constraint.java | 5 ----- .../org/apache/accumulo/core/data/Mutation.java | 3 --- .../accumulo/monitor/servlets/DefaultServlet.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 3 --- .../apache/accumulo/test/functional/ScanIdIT.java | 4 ++-- .../accumulo/test/util/SerializationUtil.java | 17 ----------------- 13 files changed, 3 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6592bb12/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6592bb12/test/src/main/java/org/apache/accumulo/test/util/SerializationUtil.java ----------------------------------------------------------------------
