You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/07/16 17:34:26 UTC
[1/2] git commit: AMBARI-6501 Extend server-side stack definition to
include metadata for additional configurations (including -env.sh files) for
each service 3. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 74fac8a26 -> 7c97da6e5
AMBARI-6501 Extend server-side stack definition to include metadata for additional configurations (including -env.sh files) for each service 3. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd15d4c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd15d4c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd15d4c8
Branch: refs/heads/trunk
Commit: fd15d4c8ce2f389ae7614d42ec9a74002af17d3a
Parents: 4cc243d
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Jul 16 18:29:12 2014 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Jul 16 18:29:12 2014 +0300
----------------------------------------------------------------------
ambari-web/app/data/HDP2/site_properties.js | 15 +++++++++++++++
ambari-web/app/data/site_properties.js | 15 +++++++++++++++
ambari-web/app/models/stack_service.js | 5 +++++
3 files changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd15d4c8/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 2e5be3b..0259477 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2596,6 +2596,21 @@ module.exports =
"filename": "hive-env.xml",
"category": "Advanced"
},
+ /**********************************************SQOOP***************************************/
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "-env.sh content",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "SQOOP",
+ "filename": "sqoop-env.xml",
+ "category": "SqoopEnv"
+ },
/**********************************************WEBHCAT***************************************/
{
"id": "site property",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd15d4c8/ambari-web/app/data/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/site_properties.js b/ambari-web/app/data/site_properties.js
index 5a3df36..73c0c6f 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -1639,6 +1639,21 @@ module.exports =
"filename": "hive-env.xml",
"category": "Advanced"
},
+ /**********************************************SQOOP***************************************/
+ {
+ "id": "site property",
+ "name": "content",
+ "displayName": "content",
+ "value": "",
+ "defaultValue": "",
+ "description": "-env.sh content",
+ "displayType": "content",
+ "isRequired": false,
+ "showLabel": false,
+ "serviceName": "SQOOP",
+ "filename": "sqoop-env.xml",
+ "category": "SqoopEnv"
+ },
/**********************************************WEBHCAT***************************************/
{
"id": "puppet var",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd15d4c8/ambari-web/app/models/stack_service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index c5c774b..e914f78 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -409,6 +409,11 @@ App.StackService.configCategories = function () {
App.ServiceConfigCategory.create({ name: 'FlumeEnv', displayName: 'Custom Flume Env', siteFileName: 'flume-env.xml', canAddProperty: false})
]);
break;
+ case 'SQOOP':
+ serviceConfigCategories.pushObjects([
+ App.ServiceConfigCategory.create({ name: 'SqoopEnv', displayName: 'Custom Sqoop Env', siteFileName: 'sqoop-env.xml', canAddProperty: false})
+ ]);
+ break;
case 'HCATALOG':
break;
default:
[2/2] git commit: Merge remote-tracking branch 'origin/trunk' into
trunk
Posted by ab...@apache.org.
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c97da6e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c97da6e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c97da6e
Branch: refs/heads/trunk
Commit: 7c97da6e5e58bbcd9bd2530bc9b1c60b67687267
Parents: fd15d4c 74fac8a
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Jul 16 18:34:23 2014 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Jul 16 18:34:23 2014 +0300
----------------------------------------------------------------------
.../server/upgrade/AbstractUpgradeCatalog.java | 51 ++++++++------
.../server/upgrade/UpgradeCatalogTest.java | 2 +-
.../global/configuration_controller.js | 51 +++++++++-----
.../main/admin/highAvailability_controller.js | 12 ++--
.../controllers/main/admin/misc_controller.js | 24 ++++---
.../app/controllers/main/admin/security.js | 9 +--
.../controllers/main/mirroring_controller.js | 7 +-
.../controllers/main/service/info/configs.js | 40 ++++++-----
.../main/service/reassign_controller.js | 20 +++---
.../app/controllers/wizard/step7_controller.js | 73 ++++++++++----------
ambari-web/app/messages.js | 4 ++
ambari-web/app/models/service_config.js | 5 +-
.../highAvailability/resourceManager/step1.hbs | 4 ++
ambari-web/app/utils/ajax/ajax.js | 7 +-
ambari-web/app/utils/config.js | 18 +----
.../app/views/common/quick_view_link_view.js | 10 +--
16 files changed, 186 insertions(+), 151 deletions(-)
----------------------------------------------------------------------