> On June 20, 2015, 9:45 p.m., Mesos ReviewBot wrote: > > Bad patch! > > > > Reviews applied: [35285, 35286, 35287] > > > > Failed command: ./support/apply-review.sh -n -r 35287 > > > > Error: > > 2015-06-20 21:41:02 URL:https://reviews.apache.org/r/35287/diff/raw/ > > [2559/2559] -> "35287.patch" [1] > > error: patch failed: > > 3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp:101 > > error: 3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp: patch > > does not apply > > Failed to apply patch > > Mark Wang wrote: > @Joris, what does this mean?
I think this means you need to rebase on master. The apply-review script is not great at resolving conflicts automatically. - Joris ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/35287/#review88668 ----------------------------------------------------------- On June 20, 2015, 4:48 p.m., Mark Wang wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/35287/ > ----------------------------------------------------------- > > (Updated June 20, 2015, 4:48 p.m.) > > > Review request for mesos and Joris Van Remoortere. > > > Bugs: MESOS-2800 > https://issues.apache.org/jira/browse/MESOS-2800 > > > Repository: mesos > > > Description > ------- > > Rename Option<T>::get(const T& _t) to getOrElse() and refactor original > functions (stout) > > > Diffs > ----- > > 3rdparty/libprocess/3rdparty/stout/include/stout/option.hpp > 8d5217a699a302cc9ebb2aa10d74cced7eb2b3d9 > 3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp > c8d30d8c193eb14f7accfde4fe02ce0710cd1817 > 3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp > f1ae80ab881ccfcefda69d5bfee2d969d171f1b9 > > Diff: https://reviews.apache.org/r/35287/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Mark Wang > >
