You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2015/06/30 01:09:08 UTC

[1/2] mesos git commit: Remove http specific protocol from master browse in webui.

Repository: mesos
Updated Branches:
  refs/heads/master 667358a04 -> 9ca4a33c9


Remove http specific protocol from master browse in webui.

Review: https://reviews.apache.org/r/36022


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/958f332f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/958f332f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/958f332f

Branch: refs/heads/master
Commit: 958f332ff152bd69bebeab34d510db471b4c3e79
Parents: 667358a
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Mon Jun 29 16:03:55 2015 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Mon Jun 29 16:06:08 2015 -0700

----------------------------------------------------------------------
 src/webui/master/static/browse.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/958f332f/src/webui/master/static/browse.html
----------------------------------------------------------------------
diff --git a/src/webui/master/static/browse.html b/src/webui/master/static/browse.html
index ce55d6b..0904c87 100644
--- a/src/webui/master/static/browse.html
+++ b/src/webui/master/static/browse.html
@@ -68,7 +68,7 @@
             </td>
             <td>
               <a data-ng-show="file.mode[0] != 'd'"
-                 href="http://{{slave_host}}/files/download.json?path={{encodeURIComponent(file.path)}}">
+                 href="//{{slave_host}}/files/download.json?path={{encodeURIComponent(file.path)}}">
                 <button class="btn btn-xs btn-default" type="button">
                   Download
                 </button>


[2/2] mesos git commit: Fixed typo in slave flags.

Posted by me...@apache.org.
Fixed typo in slave flags.

Review: https://reviews.apache.org/r/36026


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9ca4a33c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9ca4a33c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9ca4a33c

Branch: refs/heads/master
Commit: 9ca4a33c982af082c08b2a11b95755d071c864ed
Parents: 958f332
Author: Brendan Chang <bs...@mesosphere.io>
Authored: Mon Jun 29 16:06:29 2015 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Mon Jun 29 16:07:50 2015 -0700

----------------------------------------------------------------------
 src/slave/flags.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/9ca4a33c/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 6ba5a1b..8632677 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -281,7 +281,7 @@ mesos::internal::slave::Flags::Flags()
   add(&Flags::perf_duration,
       "perf_duration",
       "Duration of a perf stat sample. The duration must be less\n"
-      "that the perf_interval.",
+      "than the perf_interval.",
       Seconds(10));
 
   add(&Flags::revocable_cpu_low_priority,