incubator-crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwi...@apache.org
Subject [1/4] git commit: Merge branch 'CRUNCH-9'
Date Tue, 10 Jul 2012 22:21:22 GMT
Updated Branches:
  refs/heads/master 38c45bd94 -> b14a7d62c


Merge branch 'CRUNCH-9'


Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/b14a7d62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/b14a7d62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/b14a7d62

Branch: refs/heads/master
Commit: b14a7d62cb66a537438254237b16cf3f48fac1ac
Parents: 38c45bd 6c4b836
Author: jwills <jwills@apache.org>
Authored: Tue Jul 10 15:20:51 2012 -0700
Committer: jwills <jwills@apache.org>
Committed: Tue Jul 10 15:20:51 2012 -0700

----------------------------------------------------------------------
 .gitignore                                         |    3 +
 scrunch/examples/ClassyPageRank.scala              |   71 -----
 scrunch/examples/PageRank.scala                    |   61 -----
 scrunch/examples/WordCount.scala                   |   30 --
 scrunch/pom.xml                                    |   47 +++-
 scrunch/scripts/scrunch.py                         |  118 --------
 scrunch/src/main/assembly/release.xml              |   75 ++++++
 scrunch/src/main/conf/log4j.properties             |    8 +
 scrunch/src/main/examples/ClassyPageRank.scala     |   71 +++++
 scrunch/src/main/examples/PageRank.scala           |   61 +++++
 scrunch/src/main/examples/WordCount.scala          |   27 ++
 scrunch/src/main/scala/org/apache/scrunch/IO.scala |   13 +-
 .../scala/org/apache/scrunch/PCollection.scala     |   17 +-
 .../src/main/scala/org/apache/scrunch/PTable.scala |   12 +-
 .../main/scala/org/apache/scrunch/Pipeline.scala   |   28 ++-
 .../scala/org/apache/scrunch/PipelineLike.scala    |    6 +-
 .../scrunch/interpreter/InterpreterRunner.scala    |  208 +++++++++++++++
 scrunch/src/main/scripts/imports.scala             |   19 ++
 scrunch/src/main/scripts/scrunch                   |  163 +++++++++++
 scrunch/src/main/scripts/scrunch-job.py            |  118 ++++++++
 scrunch/src/test/resources/log4j.properties        |   13 +
 .../scrunch/interpreter/InterpreterJarTest.scala   |   70 +++++
 .../apache/crunch/impl/mr/plan/JobPrototype.java   |   10 +-
 .../java/org/apache/crunch/util/DistCache.java     |   37 +++
 src/test/resources/log4j.properties                |    1 +
 25 files changed, 980 insertions(+), 307 deletions(-)
----------------------------------------------------------------------



Mime
View raw message