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 2016/10/19 16:58:25 UTC
[15/36] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-18456
Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fbfcf98a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbfcf98a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbfcf98a
Branch: refs/heads/branch-dev-patch-upgrade
Commit: fbfcf98abd5b8ced11b9b5ef35f73a9d319d0c5e
Parents: 197a37f 8813b1f
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Oct 7 15:58:00 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Oct 7 15:58:00 2016 -0400
----------------------------------------------------------------------
.../server/state/DependencyConditionInfo.java | 102 -------------------
.../ambari/server/state/DependencyInfo.java | 36 +------
.../server/topology/BlueprintValidatorImpl.java | 13 ---
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 44 --------
.../topology/BlueprintValidatorImplTest.java | 75 +-------------
.../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 ++-
15 files changed, 193 insertions(+), 298 deletions(-)
----------------------------------------------------------------------