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 2015/04/25 01:21:10 UTC

[24/34] accumulo 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/ed7c4f6c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed7c4f6c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed7c4f6c

Branch: refs/heads/master
Commit: ed7c4f6c521af124171c757fb9b81dd7dbfb046d
Parents: 35e3f12 321f573
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Apr 21 13:26:38 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Apr 21 13:26:38 2015 -0400

----------------------------------------------------------------------
 assemble/pom.xml                                |   2 +-
 core/pom.xml                                    |   2 +-
 .../mapreduce/lib/impl/InputConfigurator.java   |   5 +-
 docs/pom.xml                                    |   2 +-
 examples/simple/pom.xml                         |   2 +-
 fate/pom.xml                                    |   2 +-
 maven-plugin/pom.xml                            |   2 +-
 minicluster/pom.xml                             |   2 +-
 pom.xml                                         |   2 +-
 proxy/pom.xml                                   |   2 +-
 server/base/pom.xml                             |   2 +-
 server/gc/pom.xml                               |   2 +-
 server/master/pom.xml                           |   2 +-
 server/monitor/pom.xml                          |   2 +-
 server/native/pom.xml                           |   2 +-
 server/tracer/pom.xml                           |   2 +-
 server/tserver/pom.xml                          |   2 +-
 .../tserver/log/LocalWALRecoveryTest.java       |   2 +-
 shell/pom.xml                                   |   2 +-
 start/pom.xml                                   |   2 +-
 test/pom.xml                                    |   2 +-
 .../accumulo/test/AccumuloOutputFormatIT.java   | 125 +++++++++++++++++++
 .../accumulo/test/AccumuloOutputFormatTest.java | 114 -----------------
 .../test/functional/AccumuloInputFormatIT.java  |  16 ++-
 trace/pom.xml                                   |   2 +-
 25 files changed, 159 insertions(+), 143 deletions(-)
----------------------------------------------------------------------