----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/38738/#review100518 -----------------------------------------------------------
Bad patch! Reviews applied: [38726] Failed command: ./support/apply-review.sh -n -r 38726 Error: 2015-09-25 03:10:05 URL:https://reviews.apache.org/r/38726/diff/raw/ [1327/1327] -> "38726.patch" [1] error: patch failed: src/common/attributes.cpp:101 error: src/common/attributes.cpp: patch does not apply Failed to apply patch - Mesos ReviewBot On Sept. 25, 2015, 12:45 a.m., Joris Van Remoortere wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/38738/ > ----------------------------------------------------------- > > (Updated Sept. 25, 2015, 12:45 a.m.) > > > Review request for mesos, Benjamin Hindman and Ben Mahler. > > > Bugs: MESOS-3510 > https://issues.apache.org/jira/browse/MESOS-3510 > > > Repository: mesos > > > Description > ------- > > This aids in verifying the files are kept in sync. > diff include/mesos/type_utils.cpp include/mesos/v1/mesos.cpp should > result in only include and namespace differences. > > > Diffs > ----- > > include/mesos/module/module.hpp e83be2822b7c0e7935ab1c8af36e5cb9b5180f20 > include/mesos/scheduler/scheduler.hpp > 5c311914eaabfa1358da5ae78c1d969089468cc1 > include/mesos/type_utils.hpp 6cedf079c710c7d6ab8f95c47c133e6a1efe9a82 > include/mesos/v1/mesos.hpp 260e1125dea792ebcece404f94363e8c4bc36f28 > include/mesos/v1/mesos.proto 58e5a6b7912d6f96d495a34d0913b9d27ad65fb5 > > Diff: https://reviews.apache.org/r/38738/diff/ > > > Testing > ------- > > Most notable is the ACL streamer which I wasn't sure if we purposely moved > into mesos as opposed to keeping the authorization directory in the previous > api. > diff include/mesos/type_utils.hpp include/mesos/v1/mesos.hpp > ``` > 19,20c19,20 > < #ifndef __MESOS_TYPE_UTILS_H__ > < #define __MESOS_TYPE_UTILS_H__ > --- > > #ifndef __MESOS_V1_HPP__ > > #define __MESOS_V1_HPP__ > 26c26 > < #include <mesos/mesos.hpp> > --- > > #include <mesos/v1/mesos.pb.h> // ONLY USEFUL AFTER RUNNING PROTOC. > 28,33d27 > < #include <mesos/module/module.hpp> > < > < #include <mesos/scheduler/scheduler.hpp> > < > < #include <stout/hashmap.hpp> > < #include <stout/stringify.hpp> > 35d28 > < #include <stout/uuid.hpp> > 40c33 > < // corresponding definitions are in src/common/type_utils.cpp. > --- > > // corresponding definitions are in src/v1/type_utils.cpp. > 44c37 > < // operators declared in type_utils.hpp. Exposing type_utils.hpp > --- > > // operators declared in mesos.hpp. Exposing mesos.hpp > 48a42 > > namespace v1 { > 61c55 > < bool operator==(const SlaveInfo& left, const SlaveInfo& right); > --- > > bool operator==(const AgentInfo& left, const AgentInfo& right); > 104c98 > < inline bool operator==(const SlaveID& left, const SlaveID& right) > --- > > inline bool operator==(const AgentID& left, const AgentID& right) > 152c146 > < inline bool operator==(const SlaveID& left, const std::string& right) > --- > > inline bool operator==(const AgentID& left, const std::string& right) > 197c191 > < inline bool operator!=(const SlaveID& left, const SlaveID& right) > --- > > inline bool operator!=(const AgentID& left, const AgentID& right) > 239c233 > < inline bool operator<(const SlaveID& left, const SlaveID& right) > --- > > inline bool operator<(const AgentID& left, const AgentID& right) > 309c303 > < inline std::ostream& operator<<(std::ostream& stream, const SlaveID& > slaveId) > --- > > inline std::ostream& operator<<(std::ostream& stream, const AgentID& > > agentId) > 311c305 > < return stream << slaveId.value(); > --- > > return stream << agentId.value(); > 315c309 > < inline std::ostream& operator<<(std::ostream& stream, const SlaveInfo& > slave) > --- > > inline std::ostream& operator<<(std::ostream& stream, const AgentInfo& > > agent) > 317c311 > < return stream << slave.DebugString(); > --- > > return stream << agent.DebugString(); > 412a407 > > } // namespace v1 { > 418c413 > < struct hash<mesos::CommandInfo_URI> > --- > > struct hash<mesos::v1::CommandInfo::URI> > 422c417 > < typedef mesos::CommandInfo_URI argument_type; > --- > > typedef mesos::v1::CommandInfo::URI argument_type; > 443c438 > < struct hash<mesos::ContainerID> > --- > > struct hash<mesos::v1::ContainerID> > 447c442 > < typedef mesos::ContainerID argument_type; > --- > > typedef mesos::v1::ContainerID argument_type; > 459c454 > < struct hash<mesos::ExecutorID> > --- > > struct hash<mesos::v1::ExecutorID> > 463c458 > < typedef mesos::ExecutorID argument_type; > --- > > typedef mesos::v1::ExecutorID argument_type; > 475c470 > < struct hash<mesos::FrameworkID> > --- > > struct hash<mesos::v1::FrameworkID> > 479c474 > < typedef mesos::FrameworkID argument_type; > --- > > typedef mesos::v1::FrameworkID argument_type; > 491c486 > < struct hash<mesos::OfferID> > --- > > struct hash<mesos::v1::OfferID> > 495c490 > < typedef mesos::OfferID argument_type; > --- > > typedef mesos::v1::OfferID argument_type; > 507c502 > < struct hash<mesos::SlaveID> > --- > > struct hash<mesos::v1::AgentID> > 511c506 > < typedef mesos::SlaveID argument_type; > --- > > typedef mesos::v1::AgentID argument_type; > 513c508 > < result_type operator()(const argument_type& slaveId) const > --- > > result_type operator()(const argument_type& agentId) const > 516c511 > < boost::hash_combine(seed, slaveId.value()); > --- > > boost::hash_combine(seed, agentId.value()); > 523c518 > < struct hash<mesos::TaskID> > --- > > struct hash<mesos::v1::TaskID> > 527c522 > < typedef mesos::TaskID argument_type; > --- > > typedef mesos::v1::TaskID argument_type; > 539c534 > < struct hash<mesos::TaskState> > --- > > struct hash<mesos::v1::TaskState> > 543c538 > < typedef mesos::TaskState argument_type; > --- > > typedef mesos::v1::TaskState argument_type; > 554c549 > < struct hash<mesos::TaskStatus_Source> > --- > > struct hash<mesos::v1::TaskStatus_Source> > 558c553 > < typedef mesos::TaskStatus_Source argument_type; > --- > > typedef mesos::v1::TaskStatus_Source argument_type; > 569c564 > < struct hash<mesos::TaskStatus_Reason> > --- > > struct hash<mesos::v1::TaskStatus_Reason> > 573c568 > < typedef mesos::TaskStatus_Reason argument_type; > --- > > typedef mesos::v1::TaskStatus_Reason argument_type; > 584c579 > < struct hash<mesos::Image::Type> > --- > > struct hash<mesos::v1::Image::Type> > 588c583 > < typedef mesos::Image::Type argument_type; > --- > > typedef mesos::v1::Image::Type argument_type; > 599c594 > < struct hash<std::pair<mesos::FrameworkID, mesos::ExecutorID>> > --- > > struct hash<std::pair<mesos::v1::FrameworkID, mesos::v1::ExecutorID>> > 604c599 > < mesos::FrameworkID, mesos::ExecutorID> argument_type; > --- > > mesos::v1::FrameworkID, mesos::v1::ExecutorID> argument_type; > 609,610c604,605 > < boost::hash_combine(seed, std::hash<mesos::FrameworkID>()(pair.first)); > < boost::hash_combine(seed, std::hash<mesos::ExecutorID>()(pair.second)); > --- > > boost::hash_combine(seed, > > std::hash<mesos::v1::FrameworkID>()(pair.first)); > > boost::hash_combine(seed, > > std::hash<mesos::v1::ExecutorID>()(pair.second)); > 617c612 > < struct hash<mesos::MachineID> > --- > > struct hash<mesos::v1::MachineID> > 621c616 > < typedef mesos::MachineID argument_type; > --- > > typedef mesos::v1::MachineID argument_type; > 634c629 > < #endif // __MESOS_TYPE_UTILS_H__ > --- > > #endif // __MESOS_V1_HPP__ > ``` > > > Thanks, > > Joris Van Remoortere > >
