----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/15726/#review29631 -----------------------------------------------------------
Ship it! Ship It! - Zhen Zhang On Nov. 20, 2013, 8:53 p.m., Kanak Biscuitwala wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/15726/ > ----------------------------------------------------------- > > (Updated Nov. 20, 2013, 8:53 p.m.) > > > Review request for helix, Zhen Zhang and Kishore Gopalakrishna. > > > Bugs: HELIX-320 > > > Repository: helix-git > > > Description > ------- > > commit a39fa848c2534eb5cdde6a590b83766e9d22daaa > Author: Kanak Biscuitwala <[email protected]> > Date: Wed Nov 20 12:51:55 2013 -0800 > > [HELIX-320] Remove merge conflicts from comments in files > > :100644 100644 1d7b23e... 119ff52... M > helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java > :100644 100644 7b4ce73... 04cc40d... M > helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java > > > Diffs > ----- > > helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java > 1d7b23e > > helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java > 7b4ce73 > > Diff: https://reviews.apache.org/r/15726/diff/ > > > Testing > ------- > > Merge conflicts no longer present. > > > Thanks, > > Kanak Biscuitwala > >
