You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/27 20:19:49 UTC
[02/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/784c7e45
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/784c7e45
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/784c7e45
Branch: refs/heads/trunk
Commit: 784c7e4565b5b36b03f88ee9a6a8484ad976b7bc
Parents: 9648082 2d1d5f9
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Oct 10 10:40:38 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Oct 10 10:40:38 2016 -0400
----------------------------------------------------------------------
.../AmbariManagementControllerImpl.java | 2 +-
.../controller/ServiceComponentHostRequest.java | 4 +-
.../BlueprintConfigurationProcessor.java | 113 ++++++--
.../internal/HostComponentResourceProvider.java | 44 +--
.../server/state/DependencyConditionInfo.java | 102 -------
.../ambari/server/state/DependencyInfo.java | 36 +--
.../server/topology/BlueprintValidatorImpl.java | 13 -
.../FALCON/0.5.0.2.1/package/scripts/falcon.py | 11 +
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 44 ---
.../4.0.0.2.0/package/scripts/oozie_service.py | 2 +-
.../BlueprintConfigurationProcessorTest.java | 82 ++++++
.../internal/UserResourceProviderDBTest.java | 280 +++++++++++++++++++
.../topology/BlueprintValidatorImplTest.java | 75 +----
.../stacks/2.1/FALCON/test_falcon_server.py | 14 +
.../ambari/view/hive2/ConnectionFactory.java | 37 ++-
.../ambari/view/hive2/PropertyValidator.java | 8 +
.../savedQueries/SavedQueryService.java | 47 +++-
.../ui/hive-web/app/controllers/queries.js | 24 +-
.../ui/hive-web/app/initializers/i18n.js | 5 +
.../views/hive-next/src/main/resources/view.xml | 9 +
.../savedQueries/SavedQueryService.java | 48 +++-
.../ui/hive-web/app/controllers/queries.js | 22 +-
.../ui/hive-web/app/initializers/i18n.js | 5 +-
.../savedQueries/SavedQueryServiceTest.java | 16 +-
24 files changed, 695 insertions(+), 348 deletions(-)
----------------------------------------------------------------------