> On Nov. 17, 2014, 9:44 p.m., Brian Federle wrote: > > I am getting conflicts in the properties file applying to the latest master > > (my HEAD is @ eba7cc78da751cc25994a5a736a87ce2e83c394e). There were a lot > > of changes lately to the localization strings, which is probably why it is > > conflicting; could you try updating the patch? > > > > Applying: CLOUDSTACK-7915: Remove hard-coded values for Load Balancer > > algorithms in UI > > error: patch failed: > > client/WEB-INF/classes/resources/messages_fr_FR.properties:1160 > > error: client/WEB-INF/classes/resources/messages_fr_FR.properties: patch > > does not apply > > error: patch failed: > > client/WEB-INF/classes/resources/messages_ja_JP.properties:740 > > error: client/WEB-INF/classes/resources/messages_ja_JP.properties: patch > > does not apply > > error: patch failed: > > client/WEB-INF/classes/resources/messages_zh_CN.properties:740 > > error: client/WEB-INF/classes/resources/messages_zh_CN.properties: patch > > does not apply > > Patch failed at 0001 CLOUDSTACK-7915: Remove hard-coded values for Load > > Balancer algorithms in UI > > Rajani Karuturi wrote: > Brian, if you use git am -3, it will do a 3-way merge and can resolve the > conflicts.
I could produce a new diff for latest master, but it will be most likely outdated when you try to apply it. Rajani's solution should work. Otherwise, it is possible to checkout the base commit for the patch (efe47b07044a863e5a34f48ef6e2468265925604), apply the patch and then merge with latest master. - Daniel ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/28043/#review61817 ----------------------------------------------------------- On Nov. 17, 2014, 6:26 p.m., Daniel Vega Simoes wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/28043/ > ----------------------------------------------------------- > > (Updated Nov. 17, 2014, 6:26 p.m.) > > > Review request for cloudstack. > > > Repository: cloudstack-git > > > Description > ------- > > JIRA: CLOUDSTACK 7915 > > Removed hard-coded values for Load Balancer algorithms in UI. > > Instead, now UI sets values loaded dynamically through load balancer provider > capabilities. > > Also updated internationalization messages. > > > Diffs > ----- > > client/WEB-INF/classes/resources/messages.properties 86eb5c2 > client/WEB-INF/classes/resources/messages_ar.properties 4f65118 > client/WEB-INF/classes/resources/messages_es.properties f2d754e > client/WEB-INF/classes/resources/messages_fr_FR.properties 004187f > client/WEB-INF/classes/resources/messages_it_IT.properties e2f3f0b > client/WEB-INF/classes/resources/messages_ja_JP.properties 7bc90b5 > client/WEB-INF/classes/resources/messages_ko_KR.properties ce79d2e > client/WEB-INF/classes/resources/messages_nb_NO.properties c169112 > client/WEB-INF/classes/resources/messages_nl_NL.properties 89ef828 > client/WEB-INF/classes/resources/messages_pl.properties 06d5ec2 > client/WEB-INF/classes/resources/messages_pt_BR.properties 8ee08ba > client/WEB-INF/classes/resources/messages_ru_RU.properties ff68668 > client/WEB-INF/classes/resources/messages_zh_CN.properties ebba5e0 > ui/dictionary.jsp 671f48f > ui/scripts/network.js c27b999 > ui/scripts/vpc.js af19d87 > > Diff: https://reviews.apache.org/r/28043/diff/ > > > Testing > ------- > > Tests performed: > - create new isolated network with DefaultIsolatedNetworkOffering, acquire > new IP, list load balancer algorithms (UI) > - create new shared network with DefaultSharedNetworkWithSourceNat, acquire > new IP, list load balancer algorithms (UI) > > It should work correctly as long as network offering is configured with LB > provider/capabilities. Otherwise, list of algorithms is empty in UI. > > > Thanks, > > Daniel Vega Simoes > >
