You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/11/11 05:49:23 UTC

[2/2] git commit: Merge branch 'FALCON-85' of https://git-wip-us.apache.org/repos/asf/incubator-falcon into FALCON-85

Merge branch 'FALCON-85' of https://git-wip-us.apache.org/repos/asf/incubator-falcon into FALCON-85


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

Branch: refs/heads/FALCON-85
Commit: 38278154998073f8cb24ef9db0716478275c2db9
Parents: 4fc7cd6 b7e678b
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Mon Nov 11 10:18:51 2013 +0530
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Mon Nov 11 10:18:51 2013 +0530

----------------------------------------------------------------------
 CHANGES.txt                                     |   6 +
 .../apache/falcon/entity/FileSystemStorage.java |   7 +-
 .../falcon/entity/FileSystemStorageTest.java    |  24 +++-
 .../falcon/converter/OozieFeedMapper.java       |  14 ++-
 .../falcon/converter/OozieFeedMapperTest.java   | 126 +++++++++++++++++--
 feed/src/test/resources/fs-replication-feed.xml |  64 ++++++++++
 feed/src/test/resources/trg-cluster-alpha.xml   |  39 ++++++
 feed/src/test/resources/trg-cluster-beta.xml    |  39 ++++++
 .../lifecycle/FileSystemFeedReplicationIT.java  |  67 +++++++++-
 .../table/complex-replicating-feed.xml          |  71 +++++++++++
 .../resources/table/target-cluster-alpha.xml    |   2 +-
 .../resources/table/target-cluster-beta.xml     |   2 +-
 12 files changed, 435 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/38278154/CHANGES.txt
----------------------------------------------------------------------