Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B561B10CA2 for ; Mon, 23 Sep 2013 23:05:15 +0000 (UTC) Received: (qmail 47518 invoked by uid 500); 23 Sep 2013 23:05:15 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 47494 invoked by uid 500); 23 Sep 2013 23:05:15 -0000 Mailing-List: contact commits-help@falcon.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.incubator.apache.org Delivered-To: mailing list commits@falcon.incubator.apache.org Received: (qmail 47486 invoked by uid 99); 23 Sep 2013 23:05:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Sep 2013 23:05:15 +0000 X-ASF-Spam-Status: No, hits=-2002.3 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 23 Sep 2013 23:05:12 +0000 Received: (qmail 47172 invoked by uid 99); 23 Sep 2013 23:04:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Sep 2013 23:04:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C21EE907BF9; Mon, 23 Sep 2013 23:04:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: venkatesh@apache.org To: commits@falcon.incubator.apache.org Date: Mon, 23 Sep 2013 23:04:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/8] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-falcon X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-falcon Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/fa2bc8e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/fa2bc8e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/fa2bc8e5 Branch: refs/heads/FALCON-85 Commit: fa2bc8e5cd40bbae728950e7c2ed171665f4856f Parents: 0dc6c6c 76fcef4 Author: Shwetha GS Authored: Tue Sep 17 15:32:14 2013 +0530 Committer: Shwetha GS Committed: Tue Sep 17 15:32:14 2013 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../main/java/org/apache/falcon/converter/OozieFeedMapper.java | 2 +- .../java/org/apache/falcon/converter/OozieFeedMapperTest.java | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fa2bc8e5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fa2bc8e5/feed/src/main/java/org/apache/falcon/converter/OozieFeedMapper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fa2bc8e5/feed/src/test/java/org/apache/falcon/converter/OozieFeedMapperTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/fa2bc8e5/pom.xml ----------------------------------------------------------------------