[ambari] branch branch-feature-AMBARI-14714-ui updated: [AMBARI-22802] Styling for install wizard (#134)

2018-01-25 Thread jonathanhurley
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714-ui
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714-ui 
by this push:
 new 52a447c  [AMBARI-22802] Styling for install wizard (#134)
52a447c is described below

commit 52a447ce82a4cd096223e9830862bcff0bbf6867
Author: Jason Golieb 
AuthorDate: Thu Jan 25 11:36:08 2018 -0500

[AMBARI-22802] Styling for install wizard (#134)
---
 ambari-web/app/assets/index.html   |   8 +-
 ambari-web/app/controllers/installer.js|  30 +-
 .../wizard/configureDownload_controller.js |   5 +
 .../wizard/customMpackRepos_controller.js  |   6 +-
 .../wizard/customProductRepos_controller.js|   6 +-
 .../wizard/downloadMpacks_controller.js|   6 +-
 .../controllers/wizard/selectMpacks_controller.js  |  12 +-
 .../app/controllers/wizard/step4_controller.js |   6 +-
 .../app/controllers/wizard/step7_controller.js |  10 +-
 .../app/controllers/wizard/step9_controller.js |   6 +-
 .../wizard/verifyProducts_controller.js|   6 +-
 ambari-web/app/messages.js |  12 +-
 ambari-web/app/routes/installer.js |  96 --
 ambari-web/app/styles/application.less | 144 +++-
 ambari-web/app/styles/bootstrap_overrides.less | 152 -
 ambari-web/app/styles/common.less  |   8 +-
 ambari-web/app/styles/stack_versions.less  |   2 +-
 ambari-web/app/styles/wizard.less  | 373 +
 ambari-web/app/templates/installer.hbs |   4 +-
 .../app/templates/wizard/configureDownload.hbs |  84 ++---
 .../app/templates/wizard/customMpackRepos.hbs  |  65 ++--
 .../app/templates/wizard/customProductRepos.hbs| 153 -
 ambari-web/app/templates/wizard/downloadMpacks.hbs |  97 +++---
 ambari-web/app/templates/wizard/selectMpacks.hbs   | 141 
 .../app/templates/wizard/selectMpacks/mpack.hbs|  28 +-
 .../wizard/selectMpacks/selectedMpackVersion.hbs   |  14 +-
 .../app/templates/wizard/selectMpacks/service.hbs  |  26 +-
 .../app/templates/wizard/selectMpacks/usecase.hbs  |  10 +-
 ambari-web/app/templates/wizard/step0.hbs  |  20 +-
 ambari-web/app/templates/wizard/step1.hbs  |   6 +-
 ambari-web/app/templates/wizard/step2.hbs  |   6 +-
 ambari-web/app/templates/wizard/step3.hbs  | 227 ++---
 ambari-web/app/templates/wizard/verifyProducts.hbs | 137 
 ambari-web/app/views/common/modal_popup.js |   2 +-
 .../app/views/wizard/configureDownload_view.js |   6 +-
 ambari-web/app/views/wizard/downloadMpacks_view.js |   9 +
 ambari-web/app/views/wizard/selectMpacks_view.js   |  29 +-
 ambari-web/app/views/wizard/verifyProducts_view.js |   9 +
 38 files changed, 1198 insertions(+), 763 deletions(-)

diff --git a/ambari-web/app/assets/index.html b/ambari-web/app/assets/index.html
index efd3c64..f55bbfe 100644
--- a/ambari-web/app/assets/index.html
+++ b/ambari-web/app/assets/index.html
@@ -29,10 +29,10 @@
   
   
   $(document).ready(function() {
-  require('initialize');
-  // make favicon work in firefox
-  $('link[type*=icon]').detach().appendTo('head');
-  $('#loading').remove();
+require('initialize');
+// make favicon work in firefox
+$('link[type*=icon]').detach().appendTo('head');
+$('#loading').remove();
   });
   
   Ambari
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index d237079..2f56ab8 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -57,6 +57,21 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
 "step10"
   ],
 
+  errors: [],
+
+  hasErrors: function () {
+return this.get('errors').length > 0;
+  }.property('errors'),
+
+  addError: function (newError) {
+const errors = this.get('errors');
+this.set('errors', errors.concat(newError));
+  },
+
+  clearErrors: function () {
+this.set('errors', []);
+  },
+
   getStepController: function (stepName) {
 if (typeof (stepName) === "number") {
   stepName = this.get('steps')[stepName];
@@ -266,7 +281,7 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
   },
   success: 'loadMpackServiceInfoSuccess',
   error: 'loadMpackServiceInfoError'
-})
+});
   },
 
   loadMpackServiceInfoSuccess: function (serviceInfo) {
@@ -277,10 +292,13 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
   loadMpackServiceInfoError: function(request, status, error) {
 const message = Em.I18n.t('installer.error.mpackServiceInfo');
 
-App.showAlertPopup(
-  Em.I18n.t('common.error'), //header
-  

[ambari] branch remote/branch-2.5 deleted (was 9f6d0b0)

2018-01-25 Thread jonathanhurley
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch remote/branch-2.5
in repository https://gitbox.apache.org/repos/asf/ambari.git.


 was 9f6d0b0  Merge branch 'branch-2.4' of 
https://git-wip-us.apache.org/repos/asf/ambari into branch-2.4

This change permanently discards the following revisions:

 discard 9f6d0b0  Merge branch 'branch-2.4' of 
https://git-wip-us.apache.org/repos/asf/ambari into branch-2.4
 discard 11751f5  AMBARI-16673. Fix for parsing multiple lines in output while 
looking for created 'llap package' name.

-- 
To stop receiving notification emails like this one, please contact
jonathanhur...@apache.org.


[ambari] branch remote/branch-2.4 deleted (was 9f6d0b0)

2018-01-25 Thread jonathanhurley
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch remote/branch-2.4
in repository https://gitbox.apache.org/repos/asf/ambari.git.


 was 9f6d0b0  Merge branch 'branch-2.4' of 
https://git-wip-us.apache.org/repos/asf/ambari into branch-2.4

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
jonathanhur...@apache.org.


[ambari] branch origin/AMBARI-12885 deleted (was f12a787)

2018-01-25 Thread jonathanhurley
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch origin/AMBARI-12885
in repository https://gitbox.apache.org/repos/asf/ambari.git.


 was f12a787  TEST3

This change permanently discards the following revisions:

 discard f12a787  TEST3
 discard 0f1c15c  TEST2
 discard 86063d1  TEST

-- 
To stop receiving notification emails like this one, please contact
jonathanhur...@apache.org.


[ambari] branch trunkpwd deleted (was a13ae6a)

2018-01-25 Thread jonathanhurley
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch trunkpwd
in repository https://gitbox.apache.org/repos/asf/ambari.git.


 was a13ae6a  Revert "AMBARI-13004. Reverting unwanted commit. Fix Storm 
sink compile time deps with latest version updates. Build number changed. 
(swagle)"

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
jonathanhur...@apache.org.


[ambari] branch trunkj deleted (was 62a0a18)

2018-01-25 Thread jonathanhurley
This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch trunkj
in repository https://gitbox.apache.org/repos/asf/ambari.git.


 was 62a0a18  AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS 
failed to restart before finalizing. (swagle)

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
jonathanhur...@apache.org.


[ambari] branch branch-feature-AMBARI-22842 updated: AMBARI-22842. Fix bad group solr doc name

2018-01-25 Thread oleewere
This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch branch-feature-AMBARI-22842
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-22842 by 
this push:
 new 924d3a7  AMBARI-22842. Fix bad group solr doc name
924d3a7 is described below

commit 924d3a7cb4a2447eec2b8320a9fee342dbd79828
Author: Oliver Szabo 
AuthorDate: Thu Jan 25 15:14:43 2018 +0100

AMBARI-22842. Fix bad group solr doc name
---
 .../src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
index 8c9ec32..6b2669b 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
@@ -57,7 +57,7 @@ public class SolrConstants {
 public static final String LOG_MESSAGE = "log_message";
 public static final String KEY_LOG_MESSAGE = "key_log_message";
 public static final String HOST = "host";
-public static final String GROUP = "host";
+public static final String GROUP = "group";
 public static final String LEVEL = "level";
 public static final String THREAD_NAME = "thread_name";
 public static final String LOGGER_NAME = "logger_name";

-- 
To stop receiving notification emails like this one, please contact
oleew...@apache.org.


[ambari] branch trunk updated: AMBARI-22413 fix tar_archive.archive_directory_dereference (benyoka) (#195)

2018-01-25 Thread benyoka
This is an automated email from the ASF dual-hosted git repository.

benyoka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new e836608  AMBARI-22413 fix tar_archive.archive_directory_dereference 
(benyoka) (#195)
e836608 is described below

commit e8366084456b652adb83a33bf56a56d17681bf98
Author: benyoka 
AuthorDate: Thu Jan 25 15:12:56 2018 +0100

AMBARI-22413 fix tar_archive.archive_directory_dereference (benyoka) (#195)
---
 .../libraries/functions/tar_archive.py |  4 +--
 .../python/stacks/2.1/FALCON/test_falcon_server.py |  6 +++--
 .../python/stacks/2.2/KNOX/test_knox_gateway.py| 29 ++
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
index 7976587..372a894 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py
@@ -25,7 +25,7 @@ from contextlib import closing
 from resource_management.core.resources.system import Execute
 
 def archive_dir(output_filename, input_dir):
-  Execute(('tar', '-zcvf', output_filename, input_dir),
+  Execute(('tar', '-zcf', output_filename, '-C', input_dir, '.'),
 sudo = True,
 tries = 3,
 try_sleep = 1,
@@ -40,7 +40,7 @@ def archive_directory_dereference(archive, directory):
   :return:  None
   """
 
-  Execute(('tar', '-zcvhf', archive, directory),
+  Execute(('tar', '-zchf', archive, '-C', directory, '.'),
 sudo = True,
 tries = 3,
 try_sleep = 1,
diff --git 
a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py 
b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index e15cfdb..0c9380d 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -239,9 +239,11 @@ class TestFalconServer(RMFTestCase):
   action = ['delete'])
 
 self.assertResourceCalled('Execute', ('tar',
- '-zcvhf',
+ '-zchf',
  '/tmp/falcon-upgrade-backup/falcon-local-backup.tar',
- u'/hadoop/falcon'),
+ '-C',
+ u'/hadoop/falcon',
+ '.'),
 sudo = True, tries = 3, try_sleep = 1,
 )
 self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'falcon-server', u'2.2.1.0-2135'),
diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py 
b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
index 3114fa8..bcba192 100644
--- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
+++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
@@ -145,9 +145,11 @@ class TestKnoxGateway(RMFTestCase):
target = RMFTestCase.TARGET_COMMON_SERVICES)
 
 self.assertResourceCalled('Execute', ('tar',
- '-zcvhf',
+ '-zchf',
  '/tmp/knox-upgrade-backup/knox-data-backup.tar',
- '/usr/hdp/current/knox-server/data'),
+ '-C',
+ '/usr/hdp/current/knox-server/data',
+ '.'),
 sudo = True, tries = 3, try_sleep = 1,
 )
 self.assertResourceCalled('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'knox-server', '2.2.1.0-3242'),
@@ -182,9 +184,11 @@ class TestKnoxGateway(RMFTestCase):
mocks_dict = mocks_dict)
 
 self.assertResourceCalled('Execute', ('tar',
- '-zcvhf',
+ '-zchf',
  '/tmp/knox-upgrade-backup/knox-data-backup.tar',
- '/usr/hdp/current/knox-server/data'),
+ '-C',
+ '/usr/hdp/current/knox-server/data',
+ '.'),
 sudo = True,  tries = 3, try_sleep = 1,
 )
 self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'knox-server', version),sudo = True)
@@ -238,9 +242,11 @@ class TestKnoxGateway(RMFTestCase):
mocks_dict = mocks_dict)
 
 self.assertResourceCalled('Execute', ('tar',
- '-zcvhf',
+ '-zchf',
  '/tmp/knox-upgrade-backup/knox-data-backup.tar',
- '/usr/hdp/current/knox-server/data'),
+ '-C',
+ '/usr/hdp/current/knox-server/data',
+ '.'),
 sudo = True, tries = 3, try_sleep = 1,
 )
 self.assertResourceCalledIgnoreEarlier('Execute', ('ambari-python-wrap', 
'/usr/bin/hdp-select', 'set', 'knox-server', version),sudo = True)
@@ -298,9 +304,11 @@ class TestKnoxGateway(RMFTestCase):
mocks_dict = mocks_dict)
 
 self.assertResourceCalled('Execute', ('tar',
- '-zcvhf',
+ '-zchf',
  '/tmp/knox-upgrade-backup/knox-data-backup.tar',
- "/usr/hdp/current/knox-server/data"),
+ '-C',
+ 

[ambari] branch trunk updated (947d7e7 -> a50d926)

2018-01-25 Thread alexantonenko
This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 947d7e7  AMBARI-22805. Improve Blueprints error handling in case of 
timeout (#185)
 add 1805903  AMBARI-22572. During cluster installation bower cannot 
resolve angularjs version (alexantonenko)
 add 17c245f  AMBARI-22572. During cluster installation bower cannot 
resolve angularjs version (angular version changed) (alexantonenko)
 new a50d926  Merge pull request #192 from hiveww/AMBARI-22572-trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-admin/src/main/resources/ui/admin-web/bower.json   | 11 +++
 ambari-admin/src/main/resources/ui/admin-web/package.json |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.


[ambari] 01/01: Merge pull request #192 from hiveww/AMBARI-22572-trunk

2018-01-25 Thread alexantonenko
This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit a50d926533fe9df7a8473d48eed82db6edd0b43e
Merge: 947d7e7 17c245f
Author: Alexander Antonenko 
AuthorDate: Thu Jan 25 15:27:34 2018 +0200

Merge pull request #192 from hiveww/AMBARI-22572-trunk

Ambari 22572 During cluster installation bower cannot resolve angularjs 
version

 ambari-admin/src/main/resources/ui/admin-web/bower.json   | 11 +++
 ambari-admin/src/main/resources/ui/admin-web/package.json |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.


[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-22776 Fix DDL issues resulting from incomplete table rename (benyoka) (#189)

2018-01-25 Thread benyoka
This is an automated email from the ASF dual-hosted git repository.

benyoka pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 34f6fa3  AMBARI-22776 Fix DDL issues resulting from incomplete table 
rename (benyoka) (#189)
34f6fa3 is described below

commit 34f6fa35f88936da3ab66c140304abd708d685cb
Author: benyoka 
AuthorDate: Thu Jan 25 14:18:07 2018 +0100

AMBARI-22776 Fix DDL issues resulting from incomplete table rename 
(benyoka) (#189)

* AMBARI-22776 Fix DDL issues resulting from incomplete table rename 
(benyoka)

* AMBARI-22776 More DDL fixes and renamings in the code (benyoka)
---
 .../internal/BlueprintResourceProvider.java|  2 +-
 .../server/orm/entities/BlueprintEntity.java   | 10 +++---
 .../orm/entities/BlueprintMpackConfigEntity.java   | 34 +-
 .../orm/entities/BlueprintMpackConfigEntityPk.java |  8 ++---
 .../orm/entities/BlueprintMpackInstanceEntity.java |  6 ++--
 .../orm/entities/BlueprintServiceConfigEntity.java |  2 +-
 .../orm/entities/BlueprintServiceEntity.java   | 16 -
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 35 +++---
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 35 +++---
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql| 35 +++---
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  | 24 ++---
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql| 35 +++---
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 41 --
 .../internal/BlueprintResourceProviderTest.java| 12 +++
 .../server/orm/entities/BlueprintEntityTest2.java  | 38 ++--
 15 files changed, 139 insertions(+), 194 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
index b9899bd..7eef2df 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
@@ -377,7 +377,7 @@ public class BlueprintResourceProvider extends 
AbstractControllerResourceProvide
 
 // TODO: use multiple mpacks
 BlueprintMpackInstanceEntity mpack =
-  
((BlueprintConfigEntity)config).getBlueprintEntity().getMpackReferences().iterator().next();
+  
((BlueprintConfigEntity)config).getBlueprintEntity().getMpackInstances().iterator().next();
 StackInfo metaInfoStack;
 
 try {
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java
index 31cbf86..ea92a7b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java
@@ -68,7 +68,7 @@ public class BlueprintEntity {
   private Collection settings = new ArrayList<>();
 
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "blueprint")
-  private Collection mpackReferences = new 
ArrayList<>();
+  private Collection mpackInstances = new 
ArrayList<>();
 
 
   /**
@@ -159,11 +159,11 @@ public class BlueprintEntity {
 this.securityDescriptorReference = securityDescriptorReference;
   }
 
-  public Collection getMpackReferences() {
-return mpackReferences;
+  public Collection getMpackInstances() {
+return mpackInstances;
   }
 
-  public void setMpackReferences(Collection 
mpackReferences) {
-this.mpackReferences = mpackReferences;
+  public void setMpackInstances(Collection 
mpackInstances) {
+this.mpackInstances = mpackInstances;
   }
 }
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java
index 50cb0d2..abc76a7 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java
@@ -38,8 +38,8 @@ import javax.persistence.Table;
 public class BlueprintMpackConfigEntity implements BlueprintConfiguration {
 
   @Id
-  @Column(name = "mpack_ref_id", nullable = false, insertable = false, 
updatable = false)
-  private Long mpackRefId;
+  @Column(name = "mpack_instance_id", nullable = false, insertable = false, 
updatable = false)
+  private Long mpackInstanceId;
 
   @Id
   @Column(name = "type_name", nullable = false, insertable = true, updatable = 
false, 

[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-22815] Change requiredServices in metainfo xml (#181)

2018-01-25 Thread dsen
This is an automated email from the ASF dual-hosted git repository.

dsen pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new aba4f77  [AMBARI-22815]   Change requiredServices in metainfo xml 
(#181)
aba4f77 is described below

commit aba4f776d3e4e87298f243369f3eb82f3c07f088
Author: Dmitry Sen 
AuthorDate: Thu Jan 25 12:34:10 2018 +0200

[AMBARI-22815]   Change requiredServices in metainfo xml (#181)

* AMBARI-22815 Change requiredServices in metainfo.xml (dsen)

* AMBARI 22815   Change requiredServices in metainfo xml   (renamed  scope  
to  dependencyType) (dsen)
---
 .../stacks/HDP/2.0.6.1/services/FLUME/metainfo.xml |  5 +-
 .../stacks/HDP/2.0.6/services/FLUME/metainfo.xml   |  5 +-
 .../stacks/HDP/2.0.7/services/HBASE/metainfo.xml   | 10 +++-
 .../HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml |  5 +-
 .../server/controller/StackServiceResponse.java|  7 +--
 .../ambari/server/state/RequiredService.java   | 63 ++
 .../ambari/server/state/ServiceDependencyType.java | 36 +
 .../apache/ambari/server/state/ServiceInfo.java|  6 +--
 .../ACCUMULO/1.6.1.2.2.0/metainfo.xml  | 10 +++-
 .../AMBARI_INFRA/0.1.0/metainfo.xml|  5 +-
 .../AMBARI_METRICS/0.1.0/metainfo.xml  |  5 +-
 .../common-services/ATLAS/0.7.0.2.5/metainfo.xml   |  5 +-
 .../common-services/ATLAS/0.7.0.3.0/metainfo.xml   |  5 +-
 .../common-services/DRUID/0.10.1/metainfo.xml  |  5 +-
 .../common-services/FALCON/0.5.0.2.1/metainfo.xml  |  5 +-
 .../common-services/HAWQ/2.0.0/metainfo.xml|  5 +-
 .../common-services/HBASE/0.96.0.2.0/metainfo.xml  | 10 +++-
 .../common-services/HBASE/2.0.0.3.0/metainfo.xml   | 10 +++-
 .../common-services/HIVE/0.12.0.2.0/metainfo.xml   | 15 --
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml| 25 +++--
 .../common-services/KAFKA/0.10.0.3.0/metainfo.xml  |  5 +-
 .../common-services/KAFKA/0.8.1/metainfo.xml   |  5 +-
 .../common-services/MAHOUT/1.0.0.2.3/metainfo.xml  |  5 +-
 .../common-services/OOZIE/4.0.0.2.0/metainfo.xml   |  5 +-
 .../common-services/OOZIE/4.2.0.2.3/metainfo.xml   |  5 +-
 .../common-services/OOZIE/4.2.0.3.0/metainfo.xml   |  5 +-
 .../common-services/PIG/0.12.0.2.0/metainfo.xml|  5 +-
 .../common-services/PIG/0.16.1.3.0/metainfo.xml| 10 +++-
 .../common-services/PXF/3.0.0/metainfo.xml |  5 +-
 .../RANGER_KMS/0.5.0.2.3/metainfo.xml  | 10 +++-
 .../RANGER_KMS/1.0.0.3.0/metainfo.xml  | 10 +++-
 .../common-services/SLIDER/0.60.0.2.2/metainfo.xml | 15 --
 .../common-services/SLIDER/0.91.0.3.0/metainfo.xml | 15 --
 .../common-services/SPARK/1.2.1/metainfo.xml   | 10 +++-
 .../common-services/SPARK/1.3.1/metainfo.xml   |  5 +-
 .../common-services/SPARK/1.4.1/metainfo.xml   |  5 +-
 .../common-services/SPARK/1.5.2/metainfo.xml   |  5 +-
 .../common-services/SPARK/1.6.0/metainfo.xml   | 15 --
 .../common-services/SPARK/2.2.0/metainfo.xml   | 15 --
 .../common-services/SPARK2/2.0.0/metainfo.xml  | 15 --
 .../common-services/SQOOP/1.4.4.2.0/metainfo.xml   |  5 +-
 .../common-services/SQOOP/1.4.4.3.0/metainfo.xml   |  5 +-
 .../common-services/STORM/0.9.1/metainfo.xml   |  5 +-
 .../common-services/STORM/1.0.1.3.0/metainfo.xml   |  5 +-
 .../common-services/TEZ/0.4.0.2.1/metainfo.xml |  5 +-
 .../common-services/TEZ/0.9.0.3.0/metainfo.xml |  5 +-
 .../common-services/YARN/2.1.0.2.0/metainfo.xml| 20 +--
 .../common-services/YARN/3.0.0.3.0/metainfo.xml| 20 +--
 .../common-services/ZEPPELIN/0.6.0/metainfo.xml|  5 +-
 .../common-services/ZEPPELIN/0.7.0/metainfo.xml|  5 +-
 .../stacks/BIGTOP/0.8/services/FLUME/metainfo.xml  |  5 +-
 .../stacks/BIGTOP/0.8/services/HBASE/metainfo.xml  | 10 +++-
 .../stacks/BIGTOP/0.8/services/HDFS/metainfo.xml   |  5 +-
 .../stacks/BIGTOP/0.8/services/HIVE/metainfo.xml   |  5 +-
 .../stacks/BIGTOP/0.8/services/OOZIE/metainfo.xml  |  5 +-
 .../stacks/BIGTOP/0.8/services/PIG/metainfo.xml|  5 +-
 .../stacks/BIGTOP/0.8/services/YARN/metainfo.xml   | 10 +++-
 .../2.0.6.GlusterFS/services/HBASE/metainfo.xml| 12 +++--
 .../2.0.6.GlusterFS/services/SQOOP/metainfo.xml|  7 ++-
 .../HDP/2.0.6.GlusterFS/services/YARN/metainfo.xml | 10 +++-
 .../HDP/2.1.GlusterFS/services/FALCON/metainfo.xml |  5 +-
 .../HDP/2.1.GlusterFS/services/FLUME/metainfo.xml  |  7 ++-
 .../HDP/2.1.GlusterFS/services/HBASE/metainfo.xml  | 12 +++--
 .../HDP/2.1.GlusterFS/services/SQOOP/metainfo.xml  |  5 +-
 .../HDP/2.1.GlusterFS/services/TEZ/metainfo.xml|  5 +-
 .../HDP/2.1.GlusterFS/services/YARN/metainfo.xml   | 10 +++-
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml  |  5 +-
 .../stacks/HDP/2.2/services/PIG/metainfo.xml   |  5 +-