You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myriad.apache.org by da...@apache.org on 2016/05/17 21:07:35 UTC
[1/2] incubator-myriad git commit: Couple of minor bug fixes for
0.2.0 RC: 1. UI frameworkShutdown is broken because of PR#58. 2. Additional
'sudo' from cgroup cmdline. 3. Adding profile info to flexdown UI (keep same
with flexup). Pull Request: Closes
Repository: incubator-myriad
Updated Branches:
refs/heads/master 6c11c7338 -> 700dd44ac
Couple of minor bug fixes for 0.2.0 RC:
1. UI frameworkShutdown is broken because of PR#58.
2. Additional 'sudo' from cgroup cmdline.
3. Adding profile info to flexdown UI (keep same with flexup).
Pull Request:
Closes #74
Author: sarjeet2013
Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/55311033
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/55311033
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/55311033
Branch: refs/heads/master
Commit: 553110336d05111e0dc8be3952881abdf81ba8b8
Parents: 6c11c73
Author: Sarjeet Singh <sa...@maprtech.com>
Authored: Mon May 16 01:41:16 2016 -0700
Committer: darinj <da...@apache.org>
Committed: Tue May 17 17:00:07 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java | 1 -
.../src/main/resources/webapp/js/components/FlexDownComponent.js | 2 +-
.../resources/webapp/js/components/ShutdownFrameworkComponent.js | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
index 2700488..8fca9e2 100644
--- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
+++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
@@ -110,7 +110,6 @@ public class NMExecutorCLGenImpl implements ExecutorCommandLineGenerator {
protected void appendCgroupsCmds(StringBuilder cmdLine) {
if (cfg.getFrameworkSuperUser().isPresent()) {
cmdLine.append(" export TASK_DIR=`basename $PWD`&&");
- appendSudo(cmdLine);
//The container executor script expects mount-path to exist and owned by the yarn user
//See: https://hadoop.apache.org/docs/stable/hadoop-yarn/hadoop-yarn-site/NodeManagerCgroups.html
//If YARN ever moves to cgroup/mem it will be necessary to add a mem version.
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js b/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
index 0a44195..1ea5218 100644
--- a/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
+++ b/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
@@ -114,7 +114,7 @@ var FlexDownComponent = React.createClass({
}
for( var ii = 0; ii < keys.length; ii++) {
var key = keys[ii];
- var txt = key;
+ var txt = key + '\t' + JSON.stringify(this.props.profiles[key]);
options.push( <option key={key} value={key}>{txt}</option> );
}
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
----------------------------------------------------------------------
diff --git a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
index a26f070..689b4e4 100644
--- a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
+++ b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
@@ -81,7 +81,7 @@ var ShutdownFrameworkComponent = React.createClass({
},
onRequestShutdown: function() {
console.log( "shutting down Myriad .... ");
- request.get('/api/framework/shutdown/framework')
+ request.post('/api/framework/shutdown/framework')
.set('Content-Type', 'application/json')
.end(function(err, res){
console.log("Result from /api/framework/shutdown/framework");
[2/2] incubator-myriad git commit: Update NOTICE file to 2016
Posted by da...@apache.org.
Update NOTICE file to 2016
Author: Darin Johnson <da...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/700dd44a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/700dd44a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/700dd44a
Branch: refs/heads/master
Commit: 700dd44ac1b30ba2359b3e2d793f1387044c1672
Parents: 5531103
Author: darinj <da...@apache.org>
Authored: Tue May 17 17:03:01 2016 -0400
Committer: darinj <da...@apache.org>
Committed: Tue May 17 17:03:01 2016 -0400
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/700dd44a/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 004b1e8..55dbd59 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Myriad
-Copyright 2015, The Apache Software Foundation
+Copyright 2016, The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).