-----------------------------------------------------------
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
