----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/47411/#review134471 -----------------------------------------------------------
I'll update this to remove the bad merge. src/slave/slave.cpp (line 960) <https://reviews.apache.org/r/47411/#comment199307> This looks like a bad Merge. - Joris Van Remoortere On May 23, 2016, 12:39 p.m., Alex Clemmer wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/47411/ > ----------------------------------------------------------- > > (Updated May 23, 2016, 12:39 p.m.) > > > Review request for mesos, Daniel Pravat, Artem Harutyunyan, Joris Van > Remoortere, and Michael Park. > > > Repository: mesos > > > Description > ------- > > Agent: Changed the names of symbols that are ambiguous on MSVC. > > > Diffs > ----- > > src/docker/docker.hpp da6e9a25b99079940958001128ee949cdb9b931b > src/slave/slave.cpp feb9f291b4188aac1a63ab9cfae8349a048663b1 > > Diff: https://reviews.apache.org/r/47411/diff/ > > > Testing > ------- > > > Thanks, > > Alex Clemmer > >
