Removed double spacing around `=` where appropriate in mesos.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4e200e55 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4e200e55 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4e200e55 Branch: refs/heads/master Commit: 4e200e55d8ed282b892f650983ebdf516680d90d Parents: 38ab764 Author: Alexander Rukletsov <al...@apache.org> Authored: Thu Aug 10 17:50:25 2017 +0200 Committer: Alexander Rukletsov <al...@apache.org> Committed: Thu Aug 10 18:26:07 2017 +0200 ---------------------------------------------------------------------- include/mesos/master/master.proto | 2 +- include/mesos/mesos.proto | 22 ++++++++++---------- include/mesos/v1/master/master.proto | 2 +- include/mesos/v1/mesos.proto | 22 ++++++++++---------- src/docker/docker.cpp | 2 +- src/executor/executor.cpp | 4 ++-- src/log/consensus.cpp | 2 +- src/master/validation.cpp | 4 ++-- .../containerizer/mesos/io/switchboard.cpp | 2 +- .../isolators/cgroups/subsystems/net_cls.cpp | 2 +- .../docker_containerizer_tests.cpp | 2 +- 11 files changed, 33 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/include/mesos/master/master.proto ---------------------------------------------------------------------- diff --git a/include/mesos/master/master.proto b/include/mesos/master/master.proto index 0e4c30e..fc5bd89 100644 --- a/include/mesos/master/master.proto +++ b/include/mesos/master/master.proto @@ -201,7 +201,7 @@ message Call { optional DestroyVolumes destroy_volumes = 10; optional UpdateMaintenanceSchedule update_maintenance_schedule = 11; optional StartMaintenance start_maintenance = 12; - optional StopMaintenance stop_maintenance = 13; + optional StopMaintenance stop_maintenance = 13; optional SetQuota set_quota = 14; optional RemoveQuota remove_quota = 15; } http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index f31f5bd..5ac242c 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -1407,15 +1407,15 @@ message TrafficControlStatistics { message IpStatistics { - optional int64 Forwarding = 1; - optional int64 DefaultTTL = 2; - optional int64 InReceives = 3; - optional int64 InHdrErrors = 4; - optional int64 InAddrErrors = 5; - optional int64 ForwDatagrams = 6; + optional int64 Forwarding = 1; + optional int64 DefaultTTL = 2; + optional int64 InReceives = 3; + optional int64 InHdrErrors = 4; + optional int64 InAddrErrors = 5; + optional int64 ForwDatagrams = 6; optional int64 InUnknownProtos = 7; - optional int64 InDiscards = 8; - optional int64 InDelivers = 9; + optional int64 InDiscards = 8; + optional int64 InDelivers = 9; optional int64 OutRequests = 10; optional int64 OutDiscards = 11; optional int64 OutNoRoutes = 12; @@ -1431,11 +1431,11 @@ message IpStatistics { message IcmpStatistics { optional int64 InMsgs = 1; - optional int64 InErrors = 2; + optional int64 InErrors = 2; optional int64 InCsumErrors = 3; - optional int64 InDestUnreachs = 4; + optional int64 InDestUnreachs = 4; optional int64 InTimeExcds = 5; - optional int64 InParmProbs = 6; + optional int64 InParmProbs = 6; optional int64 InSrcQuenchs = 7; optional int64 InRedirects = 8; optional int64 InEchos = 9; http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/include/mesos/v1/master/master.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/master/master.proto b/include/mesos/v1/master/master.proto index c04fd16..c3fb31d 100644 --- a/include/mesos/v1/master/master.proto +++ b/include/mesos/v1/master/master.proto @@ -201,7 +201,7 @@ message Call { optional DestroyVolumes destroy_volumes = 10; optional UpdateMaintenanceSchedule update_maintenance_schedule = 11; optional StartMaintenance start_maintenance = 12; - optional StopMaintenance stop_maintenance = 13; + optional StopMaintenance stop_maintenance = 13; optional SetQuota set_quota = 14; optional RemoveQuota remove_quota = 15; } http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/include/mesos/v1/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index 66386a8..ff02813 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -1390,15 +1390,15 @@ message TrafficControlStatistics { message IpStatistics { - optional int64 Forwarding = 1; - optional int64 DefaultTTL = 2; - optional int64 InReceives = 3; - optional int64 InHdrErrors = 4; - optional int64 InAddrErrors = 5; - optional int64 ForwDatagrams = 6; + optional int64 Forwarding = 1; + optional int64 DefaultTTL = 2; + optional int64 InReceives = 3; + optional int64 InHdrErrors = 4; + optional int64 InAddrErrors = 5; + optional int64 ForwDatagrams = 6; optional int64 InUnknownProtos = 7; - optional int64 InDiscards = 8; - optional int64 InDelivers = 9; + optional int64 InDiscards = 8; + optional int64 InDelivers = 9; optional int64 OutRequests = 10; optional int64 OutDiscards = 11; optional int64 OutNoRoutes = 12; @@ -1414,11 +1414,11 @@ message IpStatistics { message IcmpStatistics { optional int64 InMsgs = 1; - optional int64 InErrors = 2; + optional int64 InErrors = 2; optional int64 InCsumErrors = 3; - optional int64 InDestUnreachs = 4; + optional int64 InDestUnreachs = 4; optional int64 InTimeExcds = 5; - optional int64 InParmProbs = 6; + optional int64 InParmProbs = 6; optional int64 InSrcQuenchs = 7; optional int64 InRedirects = 8; optional int64 InEchos = 9; http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index df1490f..192e170 100755 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -1223,7 +1223,7 @@ Future<Docker::Container> Docker::inspect( { Owned<Promise<Docker::Container>> promise(new Promise<Docker::Container>()); - const string cmd = path + " -H " + socket + " inspect " + containerName; + const string cmd = path + " -H " + socket + " inspect " + containerName; _inspect(cmd, promise, retryInterval); return promise->future(); http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/executor/executor.cpp ---------------------------------------------------------------------- diff --git a/src/executor/executor.cpp b/src/executor/executor.cpp index 9c14054..91bbd1e 100644 --- a/src/executor/executor.cpp +++ b/src/executor/executor.cpp @@ -693,8 +693,8 @@ protected: // This could happen if the agent failed over after sending an event. if (event->isNone()) { - const string error = "End-Of-File received from agent. The agent closed " - "the event stream"; + const string error = "End-Of-File received from agent. The agent closed" + " the event stream"; LOG(ERROR) << error; disconnected(connectionId.get(), error); http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/log/consensus.cpp ---------------------------------------------------------------------- diff --git a/src/log/consensus.cpp b/src/log/consensus.cpp index b83c61e..9b7463a 100644 --- a/src/log/consensus.cpp +++ b/src/log/consensus.cpp @@ -45,7 +45,7 @@ namespace log { static bool isRejectedPromise(const PromiseResponse& response) { if (response.has_type()) { // New format (Mesos >= 0.26). - return response.type() == PromiseResponse::REJECT; + return response.type() == PromiseResponse::REJECT; } else { // Old format (Mesos < 0.26). return !response.okay(); http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/master/validation.cpp ---------------------------------------------------------------------- diff --git a/src/master/validation.cpp b/src/master/validation.cpp index 4885339..279dd51 100644 --- a/src/master/validation.cpp +++ b/src/master/validation.cpp @@ -1289,7 +1289,7 @@ Option<Error> validateExecutor( " should not contain any shared resources"); } - Option<double> cpus = executorResources.cpus(); + Option<double> cpus = executorResources.cpus(); if (cpus.isNone() || cpus.get() < MIN_CPUS) { LOG(WARNING) << "Executor '" << task.executor().executor_id() @@ -1476,7 +1476,7 @@ Option<Error> validateExecutor( const Resources& executorResources = executor.resources(); // Validate minimal cpus and memory resources of executor. - Option<double> cpus = executorResources.cpus(); + Option<double> cpus = executorResources.cpus(); if (cpus.isNone() || cpus.get() < MIN_CPUS) { return Error( "Executor '" + stringify(executor.executor_id()) + http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/slave/containerizer/mesos/io/switchboard.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp index 6418094..63d3cf8 100644 --- a/src/slave/containerizer/mesos/io/switchboard.cpp +++ b/src/slave/containerizer/mesos/io/switchboard.cpp @@ -906,7 +906,7 @@ void IOSwitchboard::reaped( } -const char IOSwitchboardServer::NAME[] = "mesos-io-switchboard"; +const char IOSwitchboardServer::NAME[] = "mesos-io-switchboard"; class IOSwitchboardServerProcess : public Process<IOSwitchboardServerProcess> http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp index ba563a4..f778a41 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/net_cls.cpp @@ -268,7 +268,7 @@ Try<Owned<Subsystem>> NetClsSubsystem::create( return Error("The secondary handle has to be a non-zero value."); } - Try<uint16_t> upper = numify<uint16_t>(range[1]); + Try<uint16_t> upper = numify<uint16_t>(range[1]); if (upper.isError()) { return Error( "Failed to parse the upper bound of range of secondary handles '" + http://git-wip-us.apache.org/repos/asf/mesos/blob/4e200e55/src/tests/containerizer/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp index c798459..fa91bcf 100644 --- a/src/tests/containerizer/docker_containerizer_tests.cpp +++ b/src/tests/containerizer/docker_containerizer_tests.cpp @@ -4601,7 +4601,7 @@ TEST_F(DockerContainerizerIPv6Test, ROOT_DOCKER_LaunchIPv6HostNetwork) const Offer& offer = offers.get()[0]; - TaskInfo task = createTask( + TaskInfo task = createTask( offer.slave_id(), offer.resources(), SLEEP_COMMAND(10000));
