Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/129deb7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/129deb7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/129deb7e Branch: refs/heads/master Commit: 129deb7ef019d512f0e0cf45ea57fcbce7d337b8 Parents: c98c092 40ef5d4 Author: Josh Elser <els...@apache.org> Authored: Thu Jan 23 21:33:54 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Jan 23 21:33:54 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/Constants.java | 2 ++ .../java/org/apache/accumulo/core/client/impl/OfflineScanner.java | 2 +- .../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 2 +- .../org/apache/accumulo/core/client/mapreduce/InputFormatBase.java | 2 +- .../accumulo/core/client/mapreduce/lib/util/InputConfigurator.java | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
