You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2016/05/31 14:53:17 UTC
incubator-slider git commit: SLIDER-1134 App config key-value pairs
specified on the command line seeps into resources definition
Repository: incubator-slider
Updated Branches:
refs/heads/develop eccefc1e4 -> e6999d0c1
SLIDER-1134 App config key-value pairs specified on the command line seeps into resources definition
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e6999d0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e6999d0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e6999d0c
Branch: refs/heads/develop
Commit: e6999d0c1df987705855406791a46f80e1c3effc
Parents: eccefc1
Author: Gour Saha <go...@apache.org>
Authored: Tue May 31 07:53:21 2016 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Tue May 31 07:53:21 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/client/SliderClient.java | 1 -
.../slider/common/params/AppAndResouceOptionArgsDelegate.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6999d0c/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index dd90e46..f74d3b7 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1593,7 +1593,6 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
// resource component args
appConf.merge(cmdLineResourceOptions);
- resources.merge(cmdLineResourceOptions);
resources.mergeComponents(buildInfo.getResourceCompOptionMap());
builder.init(providerName, instanceDefinition);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6999d0c/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java b/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
index 248e4c2..f171708 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
@@ -95,7 +95,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate {
*/
public Map<String, Map<String, String>> getResourceCompOptionMap() throws
BadCommandArgumentsException {
- return convertTripleListToMaps(ARG_COMP_OPT, resCompOptTriples);
+ return convertTripleListToMaps(ARG_RES_COMP_OPT, resCompOptTriples);
}
public void setOption(String key, String value) {