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 20:11:23 UTC
[1/2] mesos git commit: Fixed MesosNativeLibrary to use '_NUM'
MESOS_VERSION macros.
Repository: mesos
Updated Branches:
refs/heads/1.1.x 7fce1b33f -> f69dd55e8
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/e105363a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e105363a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e105363a
Branch: refs/heads/1.1.x
Commit: e105363a52e219a565acc91144788600eb0b9aeb
Parents: 7fce1b3
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 16:10:00 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/e105363a/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;
}
[2/2] mesos git commit: Added MESOS-6502 to CHANGLOG for 1.1.0.
Posted by jo...@apache.org.
Added MESOS-6502 to CHANGLOG for 1.1.0.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f69dd55e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f69dd55e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f69dd55e
Branch: refs/heads/1.1.x
Commit: f69dd55e8b3bfc7cd61f6959815edbd165336ee4
Parents: e105363
Author: Joris Van Remoortere <jo...@gmail.com>
Authored: Fri Oct 28 16:07:04 2016 -0400
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Oct 28 16:10:45 2016 -0400
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f69dd55e/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d0a679d..1579f80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -214,6 +214,7 @@ All Issues:
* [MESOS-6482] - Master check failure when marking an agent unreachable.
* [MESOS-6483] - Check failure when a 1.1 master marking a 0.28 agent as unreachable.
* [MESOS-6497] - Java Scheduler Adapter does not surface MasterInfo.
+ * [MESOS-6502] - _version uses incorrect MESOS_{MAJOR,MINOR,PATCH}_VERSION in libmesos java binding.
** Documentation
* [MESOS-5221] - Add Documentation for Nvidia GPU support.