> On Dec. 7, 2012, 7:28 p.m., Brock Noland wrote: > > Nice work Hari! I'll run the tests and commit if they pass!
Looks like it needs a small rebase. + patch -p1 --dry-run patching file flume-ng-core/src/main/java/org/apache/flume/channel/AbstractChannelSelector.java patching file flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java Hunk #2 FAILED at 149. 1 out of 2 hunks FAILED -- saving rejects to file flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java.rej patching file flume-ng-core/src/main/java/org/apache/flume/channel/ReplicatingChannelSelector.java patching file flume-ng-core/src/test/java/org/apache/flume/channel/TestReplicatingChannelSelector.java patching file flume-ng-doc/sphinx/FlumeUserGuide.rst Hunk #1 succeeded at 1806 (offset 1 line). Hunk #2 succeeded at 1821 (offset 1 line). $ git reset --hard HEAD HEAD is now at 15af0ce FLUME-1768: Multiplexing channel selector should allow optional-only channels $ git apply /data/patches/FLUME-1769-1.patch error: patch failed: flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java:152 error: flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java: patch does not apply - Brock ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/8413/#review14176 ----------------------------------------------------------- On Dec. 7, 2012, 7:12 p.m., Hari Shreedharan wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/8413/ > ----------------------------------------------------------- > > (Updated Dec. 7, 2012, 7:12 p.m.) > > > Review request for Flume. > > > Description > ------- > > Replicating channel selector should support optional channels > > > This addresses bug FLUME-1769. > https://issues.apache.org/jira/browse/FLUME-1769 > > > Diffs > ----- > > > flume-ng-core/src/main/java/org/apache/flume/channel/AbstractChannelSelector.java > 939257d > > flume-ng-core/src/main/java/org/apache/flume/channel/MultiplexingChannelSelector.java > 866d9dc > > flume-ng-core/src/main/java/org/apache/flume/channel/ReplicatingChannelSelector.java > 8f22746 > > flume-ng-core/src/test/java/org/apache/flume/channel/TestReplicatingChannelSelector.java > e671364 > flume-ng-doc/sphinx/FlumeUserGuide.rst f8528bb > > Diff: https://reviews.apache.org/r/8413/diff/ > > > Testing > ------- > > Added unit tests to handle this case > > > Thanks, > > Hari Shreedharan > >
