You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2013/11/10 17:33:32 UTC
[2/2] git commit: ACCUMULO-1874 Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1874 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/f63448c9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f63448c9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f63448c9
Branch: refs/heads/master
Commit: f63448c9cc93757fd904522ea4d3493d2ff0f559
Parents: 1037ad2 d868e30
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Sun Nov 10 08:26:30 2013 -0800
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Sun Nov 10 08:26:30 2013 -0800
----------------------------------------------------------------------
.../simple/filedata/CharacterHistogram.java | 5 ++--
.../examples/simple/mapreduce/JobUtil.java | 28 ++++++++++++++++++++
.../examples/simple/mapreduce/NGramIngest.java | 4 +--
.../examples/simple/mapreduce/RegexExample.java | 4 +--
.../examples/simple/mapreduce/RowHash.java | 4 +--
.../examples/simple/mapreduce/TableToFile.java | 4 +--
.../simple/mapreduce/TeraSortIngest.java | 4 +--
.../simple/mapreduce/TokenFileWordCount.java | 2 +-
.../simple/mapreduce/UniqueColumns.java | 4 +--
.../examples/simple/mapreduce/WordCount.java | 4 +--
.../mapreduce/bulk/BulkIngestExample.java | 5 ++--
.../simple/filedata/ChunkInputFormatTest.java | 5 ++--
12 files changed, 52 insertions(+), 21 deletions(-)
----------------------------------------------------------------------