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/18 00:30:13 UTC

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6


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

Branch: refs/heads/1.6
Commit: 14e3a7d5fb2598a5f15c459168809f0dec7210c9
Parents: 2364c26 fca7cb4
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Apr 17 17:45:56 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Apr 17 17:45:56 2015 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/mapred/AccumuloOutputFormat.java    | 1 +
 .../apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e3a7d5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e3a7d5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------