You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/29 14:14:25 UTC
[13/16] git commit: AMBARI-7509. Create Slider App wizard should have
entries for multiple new features - file renames. (srimanth)
AMBARI-7509. Create Slider App wizard should have entries for multiple new features - file renames. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/15745f4f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/15745f4f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/15745f4f
Branch: refs/heads/branch-alerts-dev
Commit: 15745f4f80b67b88efb9900e94abc905f4f6ba46
Parents: be13513
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Sep 26 18:05:07 2014 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Sep 26 18:05:14 2014 -0700
----------------------------------------------------------------------
.../apache/ambari/view/slider/SliderAppsViewControllerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/15745f4f/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 3ab4829..552d06f 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -590,10 +590,10 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
if (metainfo.getApplication() != null) {
Application application = metainfo.getApplication();
String appConfigJsonString = IOUtils.toString(
- zipFile.getInputStream(zipFile.getEntry("appConfig.json")),
+ zipFile.getInputStream(zipFile.getEntry("appConfig-default.json")),
"UTF-8");
String resourcesJsonString = IOUtils.toString(
- zipFile.getInputStream(zipFile.getEntry("resources.json")),
+ zipFile.getInputStream(zipFile.getEntry("resources-default.json")),
"UTF-8");
JsonElement appConfigJson = new JsonParser()
.parse(appConfigJsonString);