You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/06/07 20:19:48 UTC
[1/3] mesos git commit: Renamed the ifdef guard for resource provider
proto header.
Repository: mesos
Updated Branches:
refs/heads/master 740ffdecd -> c31f24abf
Renamed the ifdef guard for resource provider proto header.
Review: https://reviews.apache.org/r/59596
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c31f24ab
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c31f24ab
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c31f24ab
Branch: refs/heads/master
Commit: c31f24abf2477176db46e811d27d8f90ea65888c
Parents: a3b203c
Author: Jie Yu <yu...@gmail.com>
Authored: Thu May 25 09:57:59 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jun 7 13:19:45 2017 -0700
----------------------------------------------------------------------
include/mesos/resource_provider/resource_provider.hpp | 6 +++---
include/mesos/v1/resource_provider/resource_provider.hpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c31f24ab/include/mesos/resource_provider/resource_provider.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/resource_provider/resource_provider.hpp b/include/mesos/resource_provider/resource_provider.hpp
index 039c7c2..a9aceff 100644
--- a/include/mesos/resource_provider/resource_provider.hpp
+++ b/include/mesos/resource_provider/resource_provider.hpp
@@ -14,10 +14,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef __MESOS_RESOURCE_PROVIDER_HPP__
-#define __MESOS_RESOURCE_PROVIDER_HPP__
+#ifndef __MESOS_RESOURCE_PROVIDER_PROTO_HPP__
+#define __MESOS_RESOURCE_PROVIDER_PROTO_HPP__
// ONLY USEFUL AFTER RUNNING PROTOC.
#include <mesos/resource_provider/resource_provider.pb.h>
-#endif // __MESOS_RESOURCE_PROVIDER_HPP__
+#endif // __MESOS_RESOURCE_PROVIDER_PROTO_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/c31f24ab/include/mesos/v1/resource_provider/resource_provider.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/v1/resource_provider/resource_provider.hpp b/include/mesos/v1/resource_provider/resource_provider.hpp
index 2b8c8af..9d952e5 100644
--- a/include/mesos/v1/resource_provider/resource_provider.hpp
+++ b/include/mesos/v1/resource_provider/resource_provider.hpp
@@ -14,10 +14,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef __MESOS_V1_RESOURCE_PROVIDER_HPP__
-#define __MESOS_V1_RESOURCE_PROVIDER_HPP__
+#ifndef __MESOS_V1_RESOURCE_PROVIDER_PROTO_HPP__
+#define __MESOS_V1_RESOURCE_PROVIDER_PROTO_HPP__
// ONLY USEFUL AFTER RUNNING PROTOC.
#include <mesos/v1/resource_provider/resource_provider.pb.h>
-#endif // __MESOS_V1_RESOURCE_PROVIDER_HPP__
+#endif // __MESOS_V1_RESOURCE_PROVIDER_PROTO_HPP__
[3/3] mesos git commit: Added resource provider protobufs to Java and
Python bindings.
Posted by ji...@apache.org.
Added resource provider protobufs to Java and Python bindings.
Review: https://reviews.apache.org/r/59091
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7987677f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7987677f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7987677f
Branch: refs/heads/master
Commit: 7987677f3ce02f4934cb7de6e2f67553aa74312a
Parents: 740ffde
Author: Jie Yu <yu...@gmail.com>
Authored: Tue May 9 15:25:01 2017 +0200
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jun 7 13:19:45 2017 -0700
----------------------------------------------------------------------
src/Makefile.am | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7987677f/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 392f492..ee101fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -365,6 +365,7 @@ V1_JAVA_PROTOS = \
java/generated/org/apache/mesos/v1/maintenance/Protos.java \
java/generated/org/apache/mesos/v1/master/Protos.java \
java/generated/org/apache/mesos/v1/quota/Protos.java \
+ java/generated/org/apache/mesos/v1/resource_provider/Protos.java \
java/generated/org/apache/mesos/v1/scheduler/Protos.java
V1_PYTHON_PROTOS = \
@@ -375,6 +376,7 @@ V1_PYTHON_PROTOS = \
python/interface/src/mesos/v1/interface/master_pb2.py \
python/interface/src/mesos/v1/interface/mesos_pb2.py \
python/interface/src/mesos/v1/interface/quota_pb2.py \
+ python/interface/src/mesos/v1/interface/resource_provider_pb2.py \
python/interface/src/mesos/v1/interface/scheduler_pb2.py
BUILT_SOURCES += \
@@ -449,6 +451,10 @@ java/generated/org/apache/mesos/v1/Protos.java: $(V1_MESOS_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+java/generated/org/apache/mesos/v1/resource_provider/Protos.java: $(V1_RESOURCE_PROVIDER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
java/generated/org/apache/mesos/v1/scheduler/Protos.java: $(V1_SCHEDULER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
@@ -517,6 +523,12 @@ python/interface/src/mesos/v1/interface/quota_pb2.py: $(V1_QUOTA_PROTO)
--python_out=python/interface/src/mesos/v1/interface $^
$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+python/interface/src/mesos/v1/interface/resource_provider_pb2.py: $(V1_RESOURCE_PROVIDER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/v1/resource_provider $(PROTOCFLAGS) \
+ --python_out=python/interface/src/mesos/v1/interface $^
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
python/interface/src/mesos/v1/interface/scheduler_pb2.py: $(V1_SCHEDULER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/v1/scheduler $(PROTOCFLAGS) \
@@ -1448,6 +1460,7 @@ libmesos_la_SOURCES = \
$(OCI_SPEC_PROTO) \
$(OVERSUBSCRIPTION_PROTO) \
$(QUOTA_PROTO) \
+ $(RESOURCE_PROVIDER_PROTO) \
$(SCHEDULER_PROTO) \
$(STATE_PROTO) \
$(URI_PROTO) \
@@ -1458,6 +1471,7 @@ libmesos_la_SOURCES = \
$(V1_MASTER_PROTO) \
$(V1_MESOS_PROTO) \
$(V1_QUOTA_PROTO) \
+ $(V1_RESOURCE_PROVIDER_PROTO) \
$(V1_SCHEDULER_PROTO)
libmesos_la_LDFLAGS = -release $(PACKAGE_VERSION)
@@ -1768,6 +1782,7 @@ libjava_la_DEPENDENCIES = \
$(V1_MASTER_PROTO) \
$(V1_MESOS_PROTO) \
$(V1_QUOTA_PROTO) \
+ $(V1_RESOURCE_PROVIDER_PROTO) \
$(V1_SCHEDULER_PROTO)
# We don't add libjava.la to libmesos_no_3rdparty.la so we don't
[2/3] mesos git commit: Fixed an ordering style issue in automake
file.
Posted by ji...@apache.org.
Fixed an ordering style issue in automake file.
Review: https://reviews.apache.org/r/59094
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a3b203c9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a3b203c9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a3b203c9
Branch: refs/heads/master
Commit: a3b203c9704caedfe508d18799012be228f19eb3
Parents: 7987677
Author: Jie Yu <yu...@gmail.com>
Authored: Tue May 9 15:57:41 2017 +0200
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jun 7 13:19:45 2017 -0700
----------------------------------------------------------------------
src/Makefile.am | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a3b203c9/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index ee101fa..ea76312 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -423,19 +423,15 @@ java/generated/org/apache/mesos/scheduler/Protos.java: $(SCHEDULER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
-java/generated/org/apache/mesos/v1/executor/Protos.java: $(V1_EXECUTOR_PROTO)
- $(MKDIR_P) $(@D)
- $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
-
-java/generated/org/apache/mesos/v1/quota/Protos.java: $(V1_QUOTA_PROTO)
+java/generated/org/apache/mesos/v1/agent/Protos.java: $(V1_AGENT_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
-java/generated/org/apache/mesos/v1/agent/Protos.java: $(V1_AGENT_PROTO)
+java/generated/org/apache/mesos/v1/allocator/Protos.java: $(V1_ALLOCATOR_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
-java/generated/org/apache/mesos/v1/allocator/Protos.java: $(V1_ALLOCATOR_PROTO)
+java/generated/org/apache/mesos/v1/executor/Protos.java: $(V1_EXECUTOR_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
@@ -451,6 +447,10 @@ java/generated/org/apache/mesos/v1/Protos.java: $(V1_MESOS_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+java/generated/org/apache/mesos/v1/quota/Protos.java: $(V1_QUOTA_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
java/generated/org/apache/mesos/v1/resource_provider/Protos.java: $(V1_RESOURCE_PROVIDER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^