Leslin, Despite the failed item I was still able to review your patch. Please look at the other items I mentioned.
Ralph On Jun 24, 2012, at 11:43 PM, Leslin wrote: > Hi, Ralph, Hari > > yeah, there is one patch modified flume-ng yesterday. So there is conflict. > I will re-patch with latest flume-ng and upload it later. thank you! > > 2012/6/25 Hari Shreedharan <[email protected]> > >> This is an automatically generated e-mail. To reply, visit: >> https://reviews.apache.org/r/5463/ >> >> Hi Leslin, >> >> Thanks for the update. Could you please rebase the patch on trunk? It is not >> applying cleanly, I guess there was a commit which made changes to flume-ng >> script. >> >> patch -p0 < ~/Downloads/FLUME-1240_1.patch >> patching file bin/flume-ng >> Hunk #5 FAILED at 322. >> Hunk #6 succeeded at 359 (offset 1 line). >> 1 out of 6 hunks FAILED -- saving rejects to file bin/flume-ng.rej >> patching file flume-ng-core/pom.xml >> patching file flume-ng-core/scripts/saveVersion.sh >> >> >> >> - Hari >> >> On June 24th, 2012, 2:24 p.m., Leslin (Hong Xiang Lin) wrote: >> Review request for Flume. >> By Leslin (Hong Xiang Lin). >> >> *Updated June 24, 2012, 2:24 p.m.* >> Description >> >> Add feature to let flume-ng get version info: >> eslin@ubtServer:/usr/lib/flume-ng/bin$ flume-ng version >> Apache Flume version: 1.2.0-incubating-SNAPSHOT >> Built-By: 1.2.0-incubating-SNAPSHOT >> >> Testing >> >> Test with: >> flume-ng version >> flume-ng agent -n agent -f /usr/lib/flume-ng/conf/flume-conf.properties >> >> *Bugs: * FLUME-1240 <https://issues.apache.org/jira/browse/FLUME-1240> >> Diffs >> >> - bin/flume-ng (d22f370) >> - flume-ng-core/pom.xml (e4c8104) >> - flume-ng-core/scripts/saveVersion.sh (PRE-CREATION) >> - flume-ng-core/src/main/java/org/apache/flume/VersionAnnotation.java >> (PRE-CREATION) >> - flume-ng-core/src/main/java/org/apache/flume/tools/VersionInfo.java >> (PRE-CREATION) >> - flume-ng-core/src/test/java/org/apache/flume/tools/TestVersionInfo.java >> (PRE-CREATION) >> >> View Diff <https://reviews.apache.org/r/5463/diff/> >> > > > > -- > > > > Best Regards > > Leslin
