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/10/28 21:50:50 UTC
[1/3] mesos git commit: Fixed MesosNativeLibrary to use '_NUM'
MESOS_VERSION macros.
Repository: mesos
Updated Branches:
refs/heads/1.0.x d073ed53b -> 162f31bb5
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/9b8c5428
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9b8c5428
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9b8c5428
Branch: refs/heads/1.0.x
Commit: 9b8c54282c5337e28d99bc0025661131bde2246f
Parents: 5668d4f
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Fri Oct 28 15:50:10 2016 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Oct 28 17:39:37 2016 -0400
----------------------------------------------------------------------
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/9b8c5428/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;
}
[3/3] mesos git commit: Added MESOS-4638 and MESOS-6502 to 1.0.2
CHANGELOG.
Posted by jo...@apache.org.
Added MESOS-4638 and MESOS-6502 to 1.0.2 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/162f31bb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/162f31bb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/162f31bb
Branch: refs/heads/1.0.x
Commit: 162f31bb5feb7ff0b2eb78914f7ed84ff39e78e2
Parents: 9b8c542
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Fri Oct 28 17:38:05 2016 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Oct 28 17:39:47 2016 -0400
----------------------------------------------------------------------
CHANGELOG | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/162f31bb/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 753e3c0..feea00c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ Release Notes - Mesos - Version 1.0.2
All Issues:
** Bug
+ * [MESOS-4638] - Versioning preprocessor macros.
* [MESOS-4973] - Duplicates in 'unregistered_frameworks' in /state
* [MESOS-4975] - mesos::internal::master::Slave::tasks can grow unboundedly.
* [MESOS-5613] - mesos-local fails to start if MESOS_WORK_DIR isn't set.
@@ -29,6 +30,7 @@ All Issues:
* [MESOS-6420] - Mesos Agent leaking sockets when port mapping network isolator is ON.
* [MESOS-6446] - WebUI redirect doesn't work with stats from /metric/snapshot.
* [MESOS-6461] - Duplicate framework ids in /master/frameworks endpoint 'unregistered_frameworks'.
+ * [MESOS-6502] - _version uses incorrect MESOS_{MAJOR,MINOR,PATCH}_VERSION in libmesos java binding.
** Improvement
* [MESOS-6075] - Avoid libprocess functions in `mesos-containerizer launch`.
[2/3] mesos git commit: Introduce
MESOS_{MAJOR|MINOR|PATCH}_VERSION_NUM macros.
Posted by jo...@apache.org.
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/5668d4ff
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5668d4ff
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5668d4ff
Branch: refs/heads/1.0.x
Commit: 5668d4ff2655f120ca3d66c509efa40e24d5faf3
Parents: d073ed5
Author: Zhitao Li <zh...@gmail.com>
Authored: Wed Aug 17 09:34:27 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Oct 28 17:39:37 2016 -0400
----------------------------------------------------------------------
include/mesos/version.hpp.in | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5668d4ff/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__