You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/08/28 18:05:14 UTC
[1/2] git commit: AMBARI-7060. Ambari Falcon config setup issue -
localhost must be replaced with the falcon host. (Max Shepel via
onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk f2f5dff25 -> c4f1e16a7
AMBARI-7060. Ambari Falcon config setup issue - localhost must be replaced with the falcon host. (Max Shepel via onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f6b7b38
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f6b7b38
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f6b7b38
Branch: refs/heads/trunk
Commit: 9f6b7b3867bcf6fe6a07404c84846250a56924eb
Parents: 6b7e796
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Aug 28 19:01:34 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Aug 28 19:01:34 2014 +0300
----------------------------------------------------------------------
ambari-web/app/models/service_config.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9f6b7b38/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 2df2ad7..8326dd4 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -501,6 +501,10 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'storm.local.dir':
this.unionAllMountPoints(isOnlyFirstOneNeeded, localDB);
break;
+ case '*.broker.url':
+ var falconServerHost = masterComponentHostsInDB.findProperty('component', 'FALCON_SERVER').hostName;
+ this.setDefaultValue('localhost', falconServerHost);
+ break;
}
},
[2/2] git commit: Merge remote-tracking branch 'origin/trunk' into
origin-trunk
Posted by on...@apache.org.
Merge remote-tracking branch 'origin/trunk' into origin-trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4f1e16a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4f1e16a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4f1e16a
Branch: refs/heads/trunk
Commit: c4f1e16a74f6afb1d5b9fb12f7257ad2bb554edb
Parents: 9f6b7b3 f2f5dff
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Aug 28 19:05:02 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Aug 28 19:05:02 2014 +0300
----------------------------------------------------------------------
.../resource_management/TestPackageResource.py | 6 +-
.../core/providers/package/apt.py | 11 +-
.../ambari/server/api/query/QueryImpl.java | 1 -
.../resources/ResourceInstanceFactoryImpl.java | 4 +
...ackLevelConfigurationResourceDefinition.java | 53 ++++++
.../StackVersionResourceDefinition.java | 1 +
.../server/api/services/AmbariMetaInfo.java | 34 +++-
.../server/api/services/StacksService.java | 35 +++-
.../server/api/util/StackExtensionHelper.java | 105 ++++++++---
.../controller/AmbariManagementController.java | 8 +
.../AmbariManagementControllerImpl.java | 44 +++++
.../StackLevelConfigurationRequest.java | 42 +++++
.../StackLevelConfigurationResponse.java | 37 ++++
.../server/controller/StackVersionResponse.java | 14 +-
.../AbstractControllerResourceProvider.java | 2 +
...StackLevelConfigurationResourceProvider.java | 159 ++++++++++++++++
.../internal/StackVersionResourceProvider.java | 6 +
.../ambari/server/controller/spi/Resource.java | 4 +-
.../apache/ambari/server/state/ServiceInfo.java | 1 +
.../apache/ambari/server/state/StackInfo.java | 26 ++-
.../src/main/resources/key_properties.json | 5 +
.../src/main/resources/properties.json | 11 ++
.../HDP/1.3.2/configuration/cluster-env.xml | 49 +++++
.../HDP/2.0.6/configuration/cluster-env.xml | 49 +++++
.../ambari/server/api/query/QueryImplTest.java | 2 +-
.../api/util/StackExtensionHelperTest.java | 23 +--
.../internal/AbstractResourceProviderTest.java | 45 +++++
...kLevelConfigurationResourceProviderTest.java | 181 +++++++++++++++++++
.../controllers/main/service/add_controller.js | 24 +--
.../app/controllers/wizard/step8_controller.js | 12 +-
ambari-web/app/routes/add_host_routes.js | 2 +
ambari-web/app/routes/add_service_routes.js | 2 +
ambari-web/app/routes/installer.js | 2 +
.../main/service/add_controller_test.js | 10 +
34 files changed, 939 insertions(+), 71 deletions(-)
----------------------------------------------------------------------