Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d2b1282 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d2b1282 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d2b1282 Branch: refs/heads/2.4.0-maint Commit: 5d2b12825112339fc49877f2d535b8631741e299 Parents: f836c28 2b3f6d8 Author: Jenkins <[email protected]> Authored: Wed Aug 17 05:50:57 2016 +0000 Committer: Jenkins <[email protected]> Committed: Wed Aug 17 05:50:57 2016 +0000 ---------------------------------------------------------------------- ambari-admin/pom.xml | 8 +- ambari-agent/pom.xml | 8 +- ambari-client/groovy-client/pom.xml | 4 +- ambari-client/pom.xml | 4 +- ambari-client/python-client/pom.xml | 4 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 8 +- ambari-metrics/ambari-metrics-common/pom.xml | 3 +- .../ambari-metrics-flume-sink/pom.xml | 8 +- .../ambari-metrics-hadoop-sink/pom.xml | 8 +- .../ambari-metrics-host-monitoring/pom.xml | 8 +- .../ambari-metrics-kafka-sink/pom.xml | 8 +- .../ambari-metrics-storm-sink-legacy/pom.xml | 4 +- .../ambari-metrics-storm-sink/pom.xml | 8 +- .../ambari-metrics-timelineservice/pom.xml | 8 +- ambari-metrics/pom.xml | 16 +- ambari-project/pom.xml | 4 +- ambari-server/pom.xml | 8 +- .../ambari/server/utils/VersionUtils.java | 11 +- .../src/main/resources/scripts/stack_advisor.py | 6 - .../4.0/stack-advisor/stack_advisor_206.py | 1775 +----------------- .../4.0/stack-advisor/stack_advisor_21.py | 224 +-- .../4.0/stack-advisor/stack_advisor_22.py | 1618 +--------------- .../4.0/stack-advisor/stack_advisor_23.py | 954 +--------- .../BigInsights/4.1/services/stack_advisor.py | 1 - .../BigInsights/4.3/services/stack_advisor.py | 60 +- .../stacks/HDP/2.1/services/stack_advisor.py | 2 - .../stacks/HDP/2.2/services/stack_advisor.py | 2 - .../stacks/HDP/2.3/services/stack_advisor.py | 20 +- ambari-shell/ambari-groovy-shell/pom.xml | 4 +- ambari-shell/ambari-python-shell/pom.xml | 4 +- ambari-shell/pom.xml | 4 +- ambari-views/pom.xml | 8 +- ambari-web/pom.xml | 10 +- contrib/stack-select/pom.xml | 131 -- contrib/stack-select/src/main/py/conf-select | 184 -- contrib/stack-select/src/main/py/iop-select | 408 ---- contrib/views/capacity-scheduler/pom.xml | 4 +- contrib/views/files/pom.xml | 4 +- contrib/views/hive/pom.xml | 4 +- contrib/views/jobs/pom.xml | 4 +- contrib/views/pig/pom.xml | 4 +- contrib/views/pom.xml | 4 +- contrib/views/slider/pom.xml | 4 +- contrib/views/storm/pom.xml | 4 +- contrib/views/utils/pom.xml | 4 +- pom.xml | 14 +- 46 files changed, 175 insertions(+), 5420 deletions(-) ----------------------------------------------------------------------
