You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2015/07/06 19:44:24 UTC
mesos git commit: Fixed a typo "framework" to "framwork".
Repository: mesos
Updated Branches:
refs/heads/master e6c76b0e2 -> 07abeaa8c
Fixed a typo "framework" to "framwork".
Review: https://reviews.apache.org/r/36200
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/07abeaa8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/07abeaa8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/07abeaa8
Branch: refs/heads/master
Commit: 07abeaa8c00ac6630f67160a36d3014293c555bb
Parents: e6c76b0
Author: Ryuichi Okumura <ok...@okuryu.com>
Authored: Mon Jul 6 10:43:24 2015 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Jul 6 10:44:16 2015 -0700
----------------------------------------------------------------------
docs/app-framework-development-guide.md | 2 +-
frameworks/torque/torquesched.py | 2 +-
include/mesos/scheduler.hpp | 2 +-
src/java/src/org/apache/mesos/Scheduler.java | 2 +-
src/python/interface/src/mesos/interface/__init__.py | 2 +-
src/scaling/nested_exec.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/07abeaa8/docs/app-framework-development-guide.md
----------------------------------------------------------------------
diff --git a/docs/app-framework-development-guide.md b/docs/app-framework-development-guide.md
index e340a6c..0f7c7c7 100644
--- a/docs/app-framework-development-guide.md
+++ b/docs/app-framework-development-guide.md
@@ -68,7 +68,7 @@ virtual void resourceOffers(SchedulerDriver* driver,
* Invoked when an offer is no longer valid (e.g., the slave was
* lost or another framework used resources in the offer). If for
* whatever reason an offer is never rescinded (e.g., dropped
- * message, failing over framework, etc.), a framwork that attempts
+ * message, failing over framework, etc.), a framework that attempts
* to launch tasks using an invalid offer will receive TASK_LOST
* status updats for those tasks (see Scheduler::resourceOffers).
*/
http://git-wip-us.apache.org/repos/asf/mesos/blob/07abeaa8/frameworks/torque/torquesched.py
----------------------------------------------------------------------
diff --git a/frameworks/torque/torquesched.py b/frameworks/torque/torquesched.py
index c22ef91..da12f05 100644
--- a/frameworks/torque/torquesched.py
+++ b/frameworks/torque/torquesched.py
@@ -72,7 +72,7 @@ class MyScheduler(mesos.Scheduler):
return mesos.ExecutorInfo(execPath, initArg)
def registered(self, driver, fid):
- driverlog.info("Mesos torque framwork registered with frameworkID %s" % fid)
+ driverlog.info("Mesos torque framework registered with frameworkID %s" % fid)
def resourceOffer(self, driver, oid, slave_offers):
self.driver = driver
http://git-wip-us.apache.org/repos/asf/mesos/blob/07abeaa8/include/mesos/scheduler.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/scheduler.hpp b/include/mesos/scheduler.hpp
index 0b54ffe..9dae0a8 100644
--- a/include/mesos/scheduler.hpp
+++ b/include/mesos/scheduler.hpp
@@ -111,7 +111,7 @@ public:
// Invoked when an offer is no longer valid (e.g., the slave was
// lost or another framework used resources in the offer). If for
// whatever reason an offer is never rescinded (e.g., dropped
- // message, failing over framework, etc.), a framwork that attempts
+ // message, failing over framework, etc.), a framework that attempts
// to launch tasks using an invalid offer will receive TASK_LOST
// status updates for those tasks (see Scheduler::resourceOffers).
virtual void offerRescinded(
http://git-wip-us.apache.org/repos/asf/mesos/blob/07abeaa8/src/java/src/org/apache/mesos/Scheduler.java
----------------------------------------------------------------------
diff --git a/src/java/src/org/apache/mesos/Scheduler.java b/src/java/src/org/apache/mesos/Scheduler.java
index 0e02f89..4f04883 100644
--- a/src/java/src/org/apache/mesos/Scheduler.java
+++ b/src/java/src/org/apache/mesos/Scheduler.java
@@ -97,7 +97,7 @@ public interface Scheduler {
* Invoked when an offer is no longer valid (e.g., the slave was
* lost or another framework used resources in the offer). If for
* whatever reason an offer is never rescinded (e.g., dropped
- * message, failing over framework, etc.), a framwork that attempts
+ * message, failing over framework, etc.), a framework that attempts
* to launch tasks using an invalid offer will receive TASK_LOST
* status updats for those tasks (see {@link #resourceOffers}).
*
http://git-wip-us.apache.org/repos/asf/mesos/blob/07abeaa8/src/python/interface/src/mesos/interface/__init__.py
----------------------------------------------------------------------
diff --git a/src/python/interface/src/mesos/interface/__init__.py b/src/python/interface/src/mesos/interface/__init__.py
index e7b208a..686abb2 100644
--- a/src/python/interface/src/mesos/interface/__init__.py
+++ b/src/python/interface/src/mesos/interface/__init__.py
@@ -80,7 +80,7 @@ class Scheduler(object):
Invoked when an offer is no longer valid (e.g., the slave was lost or
another framework used resources in the offer.) If for whatever reason
an offer is never rescinded (e.g., dropped message, failing over
- framework, etc.), a framwork that attempts to launch tasks using an
+ framework, etc.), a framework that attempts to launch tasks using an
invalid offer will receive TASK_LOST status updats for those tasks
(see Scheduler.resourceOffers).
"""
http://git-wip-us.apache.org/repos/asf/mesos/blob/07abeaa8/src/scaling/nested_exec.py
----------------------------------------------------------------------
diff --git a/src/scaling/nested_exec.py b/src/scaling/nested_exec.py
index 17e6170..28ccc3f 100755
--- a/src/scaling/nested_exec.py
+++ b/src/scaling/nested_exec.py
@@ -26,7 +26,7 @@ class NestedExecutor(mesos.Executor):
mesos.Executor.__init__(self)
self.tid = -1
- def registered(self, driver, executorInfo, framworkInfo, slaveInfo):
+ def registered(self, driver, executorInfo, frameworkInfo, slaveInfo):
self.frameworkId = frameworkInfo.id;
def launchTask(self, driver, task):