You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/11/07 19:40:08 UTC
[1/3] mesos git commit: Introduce
MESOS_{MAJOR|MINOR|PATCH}_VERSION_NUM macros.
Repository: mesos
Updated Branches:
refs/heads/0.28.x e862b8091 -> 94b5de558
Introduce MESOS_{MAJOR|MINOR|PATCH}_VERSION_NUM macros.
This makes version based conditional compiling much easier for
module writers.
Review: https://reviews.apache.org/r/50992/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6408c54e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6408c54e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6408c54e
Branch: refs/heads/0.28.x
Commit: 6408c54e0327ab864d4e193814ee69bcd24985df
Parents: e862b80
Author: Zhitao Li <zh...@gmail.com>
Authored: Wed Aug 17 09:34:27 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Nov 7 14:36:38 2016 -0500
----------------------------------------------------------------------
include/mesos/version.hpp.in | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6408c54e/include/mesos/version.hpp.in
----------------------------------------------------------------------
diff --git a/include/mesos/version.hpp.in b/include/mesos/version.hpp.in
index c8fbc82..63b6d95 100644
--- a/include/mesos/version.hpp.in
+++ b/include/mesos/version.hpp.in
@@ -21,10 +21,15 @@
#define MESOS_VERSION "@PACKAGE_VERSION@"
+// TODO(zhitao): Change the string-valued macros to use integers
+// after a deprecation cycle started with 1.1.
#define MESOS_MAJOR_VERSION "@MESOS_MAJOR_VERSION@"
+#define MESOS_MAJOR_VERSION_NUM @MESOS_MAJOR_VERSION@
#define MESOS_MINOR_VERSION "@MESOS_MINOR_VERSION@"
+#define MESOS_MINOR_VERSION_NUM @MESOS_MINOR_VERSION@
#define MESOS_PATCH_VERSION "@MESOS_PATCH_VERSION@"
+#define MESOS_PATCH_VERSION_NUM @MESOS_PATCH_VERSION@
#endif // __MESOS_VERSION_HPP__
[3/3] mesos git commit: Added MESOS-4638 and MESOS-6502 to 0.28.3
CHANGELOG.
Posted by jo...@apache.org.
Added MESOS-4638 and MESOS-6502 to 0.28.3 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/94b5de55
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/94b5de55
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/94b5de55
Branch: refs/heads/0.28.x
Commit: 94b5de558e8bbc4b7b184caaa99afbadeb87fcdc
Parents: b0dd63e
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Mon Nov 7 14:39:14 2016 -0500
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Nov 7 14:39:14 2016 -0500
----------------------------------------------------------------------
CHANGELOG | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/94b5de55/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 2ab764e..9efd709 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ Release Notes - Mesos - Version 0.28.3
All Issues:
** Bug
* [MESOS-2043] - Framework auth fail with timeout error and never get authenticated
+ * [MESOS-4638] - Versioning preprocessor macros.
* [MESOS-5073] - Mesos allocator leaks role sorter and quota role sorters.
* [MESOS-5330] - Agent should backoff before connecting to the master.
* [MESOS-5390] - v1 Executor Protos not included in maven jar
@@ -28,6 +29,7 @@ All Issues:
* [MESOS-6246] - Libprocess links will not generate an ExitedEvent if the socket creation fails.
* [MESOS-6299] - Master doesn't remove task from pending when it is invalid.
* [MESOS-6457] - Tasks shouldn't transition from TASK_KILLING to TASK_RUNNING.
+ * [MESOS-6502] - _version uses incorrect MESOS_{MAJOR,MINOR,PATCH}_VERSION in libmesos java binding.
* [MESOS-6527] - Memory leak in the libprocess request decoder.
[2/3] mesos git commit: Fixed MesosNativeLibrary to use '_NUM'
MESOS_VERSION macros.
Posted by jo...@apache.org.
Fixed MesosNativeLibrary to use '_NUM' MESOS_VERSION macros.
Review: https://reviews.apache.org/r/53270
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b0dd63ea
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b0dd63ea
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b0dd63ea
Branch: refs/heads/0.28.x
Commit: b0dd63ea35b4338dc365da7db6c79eb9731e8e8b
Parents: 6408c54
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Fri Oct 28 15:50:10 2016 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Nov 7 14:36:46 2016 -0500
----------------------------------------------------------------------
src/java/jni/org_apache_mesos_MesosNativeLibrary.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b0dd63ea/src/java/jni/org_apache_mesos_MesosNativeLibrary.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_MesosNativeLibrary.cpp b/src/java/jni/org_apache_mesos_MesosNativeLibrary.cpp
index ff7f3c9..f6cd437 100644
--- a/src/java/jni/org_apache_mesos_MesosNativeLibrary.cpp
+++ b/src/java/jni/org_apache_mesos_MesosNativeLibrary.cpp
@@ -22,7 +22,7 @@ extern "C" {
/*
* Class: org_apache_mesos_MesosNativeLibrary
- * Method: version
+ * Method: _version
* Signature: ()Lorg/apache/mesos/MesosNativeLibrary$Version;
*/
JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosNativeLibrary__1version
@@ -33,9 +33,9 @@ JNIEXPORT jobject JNICALL Java_org_apache_mesos_MesosNativeLibrary__1version
jobject jversion = env->NewObject(
clazz,
_init_,
- (jlong) MESOS_MAJOR_VERSION,
- (jlong) MESOS_MINOR_VERSION,
- (jlong) MESOS_PATCH_VERSION);
+ (jlong) MESOS_MAJOR_VERSION_NUM,
+ (jlong) MESOS_MINOR_VERSION_NUM,
+ (jlong) MESOS_PATCH_VERSION_NUM);
return jversion;
}