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/197a37f0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/197a37f0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/197a37f0 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 197a37f034b2bc10f483d558cde7ab0f874c8d4c Parents: 78a875c f6124a0 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Oct 7 14:21:34 2016 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Fri Oct 7 14:21:34 2016 -0400 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent | 17 ++ .../TestDataStructureUtils.py | 47 ++++ .../libraries/functions/data_structure_utils.py | 57 ++++ .../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 +++ .../4.0.0.2.0/package/scripts/oozie_service.py | 5 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 269 ++++++++++++------- .../stacks/HDP/2.3/services/stack_advisor.py | 13 +- .../topology/BlueprintValidatorImplTest.java | 75 +++++- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 8 + .../stacks/2.0.6/common/test_stack_advisor.py | 215 +++++++++++++++ .../MICROSOFT_R/8.0.0/kerberos.json | 15 -- .../MICROSOFT_R/8.0.0/metainfo.xml | 53 ---- .../package/files/microsoft_r_serviceCheck.r | 28 -- .../8.0.0/package/scripts/microsoft_r.py | 47 ---- .../MICROSOFT_R/8.0.0/package/scripts/params.py | 31 --- .../8.0.0/package/scripts/params_linux.py | 79 ------ .../8.0.0/package/scripts/params_windows.py | 26 -- .../8.0.0/package/scripts/service_check.py | 89 ------ .../MICROSOFT_R/8.0.0/role_command_order.json | 6 - .../MICROSOFT_R/8.0.0/service_advisor.py | 73 ----- .../MICROSOFT_R/8.0.5/kerberos.json | 15 ++ .../MICROSOFT_R/8.0.5/metainfo.xml | 53 ++++ .../package/files/microsoft_r_serviceCheck.r | 28 ++ .../8.0.5/package/scripts/microsoft_r.py | 47 ++++ .../MICROSOFT_R/8.0.5/package/scripts/params.py | 31 +++ .../8.0.5/package/scripts/params_linux.py | 79 ++++++ .../8.0.5/package/scripts/params_windows.py | 26 ++ .../8.0.5/package/scripts/service_check.py | 89 ++++++ .../MICROSOFT_R/8.0.5/role_command_order.json | 6 + .../MICROSOFT_R/8.0.5/service_advisor.py | 73 +++++ .../MICROSOFT_R/8.0.0/metainfo.xml | 28 -- .../MICROSOFT_R/8.0.0/repos/repoinfo.xml | 33 --- .../MICROSOFT_R/8.0.5/metainfo.xml | 28 ++ .../MICROSOFT_R/8.0.5/repos/repoinfo.xml | 33 +++ .../src/main/resources/mpack.json | 2 +- .../ui/hueambarimigration-view/package.json | 2 +- .../src/main/resources/ui/package.json | 2 +- 40 files changed, 1304 insertions(+), 619 deletions(-) ----------------------------------------------------------------------
