You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/04/04 22:48:54 UTC
[2/3] mesos git commit: Changed non-ascii characters to their ascii
equivalent.
Changed non-ascii characters to their ascii equivalent.
Review: https://reviews.apache.org/r/45660/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/905f99e4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/905f99e4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/905f99e4
Branch: refs/heads/master
Commit: 905f99e47196236b0ebdacd45bbd1f4f252de323
Parents: 2cac927
Author: Alexander Rukletsov <al...@apache.org>
Authored: Mon Apr 4 22:14:45 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Apr 4 22:42:27 2016 +0200
----------------------------------------------------------------------
docs/versioning.md | 4 ++--
src/slave/flags.cpp | 2 +-
src/uri/fetchers/curl.cpp | 2 +-
src/uri/fetchers/docker.cpp | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/905f99e4/docs/versioning.md
----------------------------------------------------------------------
diff --git a/docs/versioning.md b/docs/versioning.md
index ecacd84..800debe 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -82,7 +82,7 @@ include/mesos/v1/scheduler/scheduler.proto
package mesos.v1.scheduler;
option java_package = "org.apache.mesos.v1.scheduler";
option java_outer_classname = "Protos";
-…
+...
```
The corresponding internal protobufs for the Scheduler API are located at:
@@ -93,7 +93,7 @@ include/mesos/scheduler/scheduler.proto
package mesos.scheduler;
option java_package = "org.apache.mesos.scheduler";
option java_outer_classname = "Protos";
-…
+...
```
The users of the API send requests (and receive responses) based on the versioned protobufs. We implemented [evolve](https://github.com/apache/mesos/blob/master/src/internal/evolve.hpp)/[devolve](https://github.com/apache/mesos/blob/master/src/internal/devolve.hpp) converters that can convert protobufs from any supported version to the internal protobuf and vice versa.
http://git-wip-us.apache.org/repos/asf/mesos/blob/905f99e4/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 0551ec3..04d4b61 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -615,7 +615,7 @@ mesos::internal::slave::Flags::Flags()
"Directory path of the CNI plugin binaries. The `network/cni`\n"
"isolator will find CNI plugins under this directory so that\n"
"it can execute the plugins to add/delete container from the CNI\n"
- "networks. It is the operator’s responsibility to install the CNI\n"
+ "networks. It is the operator's responsibility to install the CNI\n"
"plugin binaries in the specified directory.");
add(&Flags::network_cni_config_dir,
http://git-wip-us.apache.org/repos/asf/mesos/blob/905f99e4/src/uri/fetchers/curl.cpp
----------------------------------------------------------------------
diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp
index cb50103..c442062 100644
--- a/src/uri/fetchers/curl.cpp
+++ b/src/uri/fetchers/curl.cpp
@@ -87,7 +87,7 @@ Future<Nothing> CurlFetcherPlugin::fetch(
const vector<string> argv = {
"curl",
- "-s", // Don’t show progress meter or error messages.
+ "-s", // Don't show progress meter or error messages.
"-S", // Makes curl show an error message if it fails.
"-L", // Follow HTTP 3xx redirects.
"-w", "%{http_code}", // Display HTTP response code on stdout.
http://git-wip-us.apache.org/repos/asf/mesos/blob/905f99e4/src/uri/fetchers/docker.cpp
----------------------------------------------------------------------
diff --git a/src/uri/fetchers/docker.cpp b/src/uri/fetchers/docker.cpp
index fbfc96c..ab8f5e0 100644
--- a/src/uri/fetchers/docker.cpp
+++ b/src/uri/fetchers/docker.cpp
@@ -96,7 +96,7 @@ static Future<http::Response> curl(
{
vector<string> argv = {
"curl",
- "-s", // Don’t show progress meter or error messages.
+ "-s", // Don't show progress meter or error messages.
"-S", // Make curl show an error message if it fails.
"-L", // Follow HTTP 3xx redirects.
"-i", // Include the HTTP-header in the output.
@@ -195,7 +195,7 @@ static Future<int> download(
vector<string> argv = {
"curl",
- "-s", // Don’t show progress meter or error messages.
+ "-s", // Don't show progress meter or error messages.
"-S", // Make curl show an error message if it fails.
"-L", // Follow HTTP 3xx redirects.
"-w", "%{http_code}", // Display HTTP response code on stdout.