You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/06/09 16:54:09 UTC

[4/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/13d20941
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d20941
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13d20941

Branch: refs/heads/master
Commit: 13d20941b9fcc4f0e5a219479d55128b216b7f4c
Parents: 63b9685 b06799a
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Jun 9 10:53:53 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Jun 9 10:53:53 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(-)
----------------------------------------------------------------------