> On July 6, 2015, 5:23 p.m., Joris Van Remoortere wrote: > > Hi Mark, > > Can you please make sure to rebase and post-review all of the patches in > > the dependency chain? The build bot will keep reporting this conflict until > > it can apply the patches in the order it reports in its review.
Yea, I resolved the conflict. - Mark ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/35287/#review90504 ----------------------------------------------------------- On July 6, 2015, 6 p.m., Mark Wang wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/35287/ > ----------------------------------------------------------- > > (Updated July 6, 2015, 6 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 > 3d9b7a7568de6734097733f4e6d59acba629b849 > 3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp > 784104f26ceee2ef90709056a5f4428d48390c36 > 3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp > d87cf22dbb98e1ac99f129668ad984a1542e4ec9 > 3rdparty/libprocess/src/subprocess.cpp > 5b41f0d88fcab93d51d5c503f69faccedc210868 > > Diff: https://reviews.apache.org/r/35287/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Mark Wang > >
