Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 9062c2559 -> 1a33f6df9 refs/heads/master ced3293b3 -> 1fe48e112
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9062c255 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9062c255 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9062c255 Branch: refs/heads/master Commit: 9062c2559a1464f196a4ba5bb0200818d1b5bf9c Parents: 0038df1 ae1682d Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Jun 9 10:53:22 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Jun 9 10:53:22 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/Constants.java | 2 ++ .../client/mapred/AccumuloFileOutputFormat.java | 3 +- .../mapreduce/lib/impl/ConfiguratorBase.java | 37 +++++++++++++++++++- .../mapred/AccumuloFileOutputFormatTest.java | 3 ++ .../lib/impl/ConfiguratorBaseTest.java | 8 +++++ 5 files changed, 51 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
