incubator-crunch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwi...@apache.org
Subject [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-crunch
Date Sat, 22 Sep 2012 00:31:40 GMT
Updated Branches:
  refs/heads/master a66b5edb0 -> cfccf494d


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


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

Branch: refs/heads/master
Commit: cfccf494dba2b0870c96ede4d40934231291cf33
Parents: 4e0ead8 a66b5ed
Author: Josh Wills <jwills@apache.org>
Authored: Fri Sep 21 16:23:21 2012 -0700
Committer: Josh Wills <jwills@apache.org>
Committed: Fri Sep 21 16:23:21 2012 -0700

----------------------------------------------------------------------
 .../apache/crunch/examples/AverageBytesByIP.java   |   17 ++-
 .../org/apache/crunch/examples/TotalBytesByIP.java |   17 ++-
 .../java/org/apache/crunch/examples/WordCount.java |   17 ++-
 .../src/it/java/org/apache/crunch/CleanTextIT.java |   21 +++--
 .../it/java/org/apache/crunch/MapPObjectIT.java    |    8 +-
 .../java/org/apache/crunch/MaterializeToMapIT.java |    5 +-
 .../java/org/apache/crunch/impl/mr/plan/Graph.java |   21 +++--
 .../main/java/org/apache/crunch/lib/Aggregate.java |    7 +-
 .../main/java/org/apache/crunch/lib/Cartesian.java |   45 ++++------
 .../apache/crunch/lib/join/FullOuterJoinFn.java    |    1 +
 .../org/apache/crunch/lib/join/InnerJoinFn.java    |    1 +
 .../java/org/apache/crunch/lib/join/JoinFn.java    |    6 +
 .../apache/crunch/lib/join/LeftOuterJoinFn.java    |    1 +
 .../apache/crunch/lib/join/RightOuterJoinFn.java   |    1 +
 .../main/java/org/apache/crunch/types/PType.java   |    8 ++
 .../crunch/types/avro/AvroGroupedTableType.java    |    5 +
 .../org/apache/crunch/types/avro/AvroType.java     |    5 +
 .../types/writable/WritableGroupedTableType.java   |    5 +
 .../crunch/types/writable/WritableTableType.java   |    6 +
 .../apache/crunch/types/writable/WritableType.java |   14 +++
 .../java/org/apache/crunch/lib/CartesianTest.java  |   72 +++++++++------
 .../writable/WritableGroupedTableTypeTest.java     |    1 +
 .../types/writable/WritableTableTypeTest.java      |    2 +-
 .../crunch/types/writable/WritableTypeTest.java    |   18 +++-
 24 files changed, 196 insertions(+), 108 deletions(-)
----------------------------------------------------------------------



Mime
View raw message