You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2018/01/30 22:45:55 UTC

mesos git commit: Fixed duplicate protobuf linking in Python examples.

Repository: mesos
Updated Branches:
  refs/heads/master de278b4ae -> 320ebd7a0


Fixed duplicate protobuf linking in Python examples.

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


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

Branch: refs/heads/master
Commit: 320ebd7a051e4cf3d1eb2a773ff782a0cdbfc8b4
Parents: de278b4
Author: Till Toenshoff <to...@me.com>
Authored: Tue Jan 30 23:19:09 2018 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Jan 30 23:19:09 2018 +0100

----------------------------------------------------------------------
 src/examples/python/test_executor.py  | 4 ++--
 src/examples/python/test_framework.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/320ebd7a/src/examples/python/test_executor.py
----------------------------------------------------------------------
diff --git a/src/examples/python/test_executor.py b/src/examples/python/test_executor.py
index f29da95..1fe611b 100755
--- a/src/examples/python/test_executor.py
+++ b/src/examples/python/test_executor.py
@@ -22,7 +22,7 @@ import time
 
 import mesos.interface
 from mesos.interface import mesos_pb2
-import mesos.native
+from mesos.executor import MesosExecutorDriver
 
 class MyExecutor(mesos.interface.Executor):
     def launchTask(self, driver, task):
@@ -55,5 +55,5 @@ class MyExecutor(mesos.interface.Executor):
 
 if __name__ == "__main__":
     print "Starting executor"
-    driver = mesos.native.MesosExecutorDriver(MyExecutor())
+    driver = MesosExecutorDriver(MyExecutor())
     sys.exit(0 if driver.run() == mesos_pb2.DRIVER_STOPPED else 1)

http://git-wip-us.apache.org/repos/asf/mesos/blob/320ebd7a/src/examples/python/test_framework.py
----------------------------------------------------------------------
diff --git a/src/examples/python/test_framework.py b/src/examples/python/test_framework.py
index 836c1a9..b174a25 100755
--- a/src/examples/python/test_framework.py
+++ b/src/examples/python/test_framework.py
@@ -22,7 +22,7 @@ import time
 
 import mesos.interface
 from mesos.interface import mesos_pb2
-import mesos.native
+from mesos.scheduler import MesosSchedulerDriver
 
 TOTAL_TASKS = 5
 
@@ -188,7 +188,7 @@ if __name__ == "__main__":
 
         framework.principal = os.getenv("DEFAULT_PRINCIPAL")
 
-        driver = mesos.native.MesosSchedulerDriver(
+        driver = MesosSchedulerDriver(
             TestScheduler(implicitAcknowledgements, executor),
             framework,
             sys.argv[1],
@@ -197,7 +197,7 @@ if __name__ == "__main__":
     else:
         framework.principal = "test-framework-python"
 
-        driver = mesos.native.MesosSchedulerDriver(
+        driver = MesosSchedulerDriver(
             TestScheduler(implicitAcknowledgements, executor),
             framework,
             sys.argv[1],