myriad-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dar...@apache.org
Subject incubator-myriad git commit: Update to mesos 0.28.1 JIRA: [Myriad-197] https://issues.apache.org/jira/browse/MYRIAD-197 Pull Request: Closes #66 Author: Mohit Soni <mohitsoni1989@gmail.com>
Date Mon, 09 May 2016 19:07:25 GMT
Repository: incubator-myriad
Updated Branches:
  refs/heads/master f1bc1d5ee -> 519d9b421


Update to mesos 0.28.1
JIRA:
  [Myriad-197] https://issues.apache.org/jira/browse/MYRIAD-197
Pull Request:
  Closes #66
Author:
  Mohit Soni <mohitsoni1989@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/519d9b42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/519d9b42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/519d9b42

Branch: refs/heads/master
Commit: 519d9b421e74307927051598c0c26b2af857789e
Parents: f1bc1d5
Author: Mohit Soni <mohitsoni1989@gmail.com>
Authored: Sun May 1 01:02:14 2016 -0700
Committer: darinj <darinj@apache.org>
Committed: Mon May 9 15:02:20 2016 -0400

----------------------------------------------------------------------
 build.gradle                                                      | 2 +-
 myriad-scheduler/src/main/java/org/apache/myriad/MesosModule.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/519d9b42/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 067a52d..54e3eac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@ subprojects {
     version = "0.1.0"
 
     ext {
-        mesosVer = "0.24.1"
+        mesosVer = "0.28.1"
         //Allows passing -PhadoopVer=2.6.0 from command line
         if(!project.hasProperty('hadoopVer')) {
             hadoopVer = "2.7.0"

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/519d9b42/myriad-scheduler/src/main/java/org/apache/myriad/MesosModule.java
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/MesosModule.java b/myriad-scheduler/src/main/java/org/apache/myriad/MesosModule.java
index de0f99f..8390749 100644
--- a/myriad-scheduler/src/main/java/org/apache/myriad/MesosModule.java
+++ b/myriad-scheduler/src/main/java/org/apache/myriad/MesosModule.java
@@ -83,7 +83,7 @@ public class MesosModule extends AbstractModule {
       credentialBuilder.setPrincipal(mesosAuthenticationPrincipal);
       if (StringUtils.isNotEmpty(mesosAuthenticationSecretFilename)) {
         try {
-          credentialBuilder.setSecret(ByteString.readFrom(new FileInputStream(mesosAuthenticationSecretFilename)));
+          credentialBuilder.setSecretBytes(ByteString.readFrom(new FileInputStream(mesosAuthenticationSecretFilename)));
         } catch (FileNotFoundException ex) {
           LOGGER.error("Mesos authentication secret file was not found", ex);
           throw new RuntimeException(ex);


Mime
View raw message