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/96c18c3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/96c18c3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/96c18c3c Branch: refs/heads/master Commit: 96c18c3c509e66fb628cf850ec211e5ea35dea31 Parents: d8c6161 8be06f3 Author: srikanth.sundarrajan <srik...@apache.org> Authored: Tue Dec 2 09:53:47 2014 +0530 Committer: srikanth.sundarrajan <srik...@apache.org> Committed: Tue Dec 2 09:53:47 2014 +0530 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../regression/core/helpers/LineageHelper.java | 16 ++++---------- .../core/response/ServiceResponse.java | 14 ++----------- .../core/supportClasses/HadoopFileEditor.java | 2 +- .../falcon/regression/core/util/ExecUtil.java | 6 ++++-- .../falcon/regression/core/util/HadoopUtil.java | 22 ++++++-------------- .../regression/core/util/InstanceUtil.java | 16 ++++---------- .../falcon/regression/core/util/TimeUtil.java | 1 - .../org/apache/falcon/request/BaseRequest.java | 4 +++- .../regression/testHelper/BaseTestClass.java | 10 ++------- .../regression/testHelper/BaseUITestClass.java | 6 +++--- .../prism/FeedDelayParallelTimeoutTest.java | 4 ++-- .../prism/PrismProcessDeleteTest.java | 2 +- .../falcon/regression/ui/LineageGraphTest.java | 12 +++++------ .../falcon/regression/ui/ProcessUITest.java | 4 ++-- 15 files changed, 43 insertions(+), 79 deletions(-) ----------------------------------------------------------------------
