falcon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Paul Isaychuk" <pisayc...@hortonworks.com>
Subject Review Request 37350: [FALCON-1388] Fix merge conflicts produced by FALCON-1002
Date Tue, 11 Aug 2015 09:39:36 GMT

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/37350/
-----------------------------------------------------------

Review request for Falcon.


Bugs: FALCON-1388
    https://issues.apache.org/jira/browse/FALCON-1388


Repository: falcon-git


Description
-------

FALCON-1002 produced few merge conflicts thus falcon-regression build fails.


Diffs
-----

  falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
36f2786 

Diff: https://reviews.apache.org/r/37350/diff/


Testing
-------


Thanks,

Paul Isaychuk


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message