> On Nov. 5, 2012, 10:50 p.m., Benjamin Hindman wrote: > > src/Makefile.am, line 365 > > <https://reviews.apache.org/r/7855/diff/1/?file=185197#file185197line365> > > > > Wasn't this reformatting in a different review? > > Ben Mahler wrote: > Yep, but this will conflict either way since I'm adding files in here.. > Figured the merge is simpler with me duplicating the formatting fix.
I don't follow. If the other commit gets applied first, adding lines should apply cleanly. However, attempting to reformat _and_ adding lines will not apply at all. - Benjamin ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/7855/#review13112 ----------------------------------------------------------- On Nov. 6, 2012, 6:23 a.m., Ben Mahler wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/7855/ > ----------------------------------------------------------- > > (Updated Nov. 6, 2012, 6:23 a.m.) > > > Review request for mesos, Benjamin Hindman and Vinod Kone. > > > Description > ------- > > Saves around 750KB of content to send over the wire, for little effort. > > > Diffs > ----- > > src/Makefile.am 062c45c060c67e983d0c27770eb3f1eefd582c8f > src/webui/master/static/angular-1.0.0rc8.min.js PRE-CREATION > src/webui/master/static/bootstrap/js/jquery-1.7.1.js PRE-CREATION > src/webui/master/static/bootstrap/js/jquery-1.7.1.min.js PRE-CREATION > src/webui/master/static/bootstrap/js/jquery.js > 00c4e23a27b15f6158ea46a016beb0ae95c6596d > src/webui/master/static/cubism.v1.min.js PRE-CREATION > src/webui/master/static/d3.v2.min.js PRE-CREATION > src/webui/master/static/index.html 5e03ef6d054fab962657c1598888e65232f4c7e3 > src/webui/master/static/pailer.html > 80dcd7b349582cb1875d1a72745c9c22394c0a26 > src/webui/master/static/underscore-1.3.3.min.js PRE-CREATION > src/webui/master/static/underscore-min.js > 5a0cb3b008d213ef3ecd3147c51eed08d98e2c54 > > Diff: https://reviews.apache.org/r/7855/diff/ > > > Testing > ------- > > Local runs, made sure to not forget adding to the Makefile this time. > > > Thanks, > > Ben Mahler > >
