Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91ae5f27 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91ae5f27 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91ae5f27 Branch: refs/heads/trunk Commit: 91ae5f27e98ec4d81c7299480b8adb3619e31c5b Parents: 0de98b0 ad983de Author: Nate Cole <nc...@hortonworks.com> Authored: Thu Sep 4 18:35:01 2014 -0400 Committer: Nate Cole <nc...@hortonworks.com> Committed: Thu Sep 4 18:35:01 2014 -0400 ---------------------------------------------------------------------- .../src/main/resources/ui/admin-web/gulpfile.js | 51 - .../main/resources/ui/admin-web/package.json | 9 - ambari-agent/pom.xml | 12 +- .../src/main/python/ambari_agent/HostInfo.py | 2 +- .../test/python/ambari_agent/TestHardware.py | 4 +- .../resource_management/TestContentSources.py | 2 +- .../resource_management/TestPackageResource.py | 8 +- .../TestRepositoryResource.py | 16 +- .../src/main/python/ambari_commons/os_check.py | 8 +- .../src/main/python/ambari_jinja2/AUTHORS | 31 + .../src/main/python/ambari_jinja2/CHANGES | 235 +++ .../src/main/python/ambari_jinja2/LICENSE | 31 + .../src/main/python/ambari_jinja2/MANIFEST.in | 12 + .../src/main/python/ambari_jinja2/Makefile | 4 + .../ambari_jinja2/ambari_jinja2/__init__.py | 73 + .../ambari_jinja2/ambari_jinja2/_debugsupport.c | 78 + .../ambari_jinja2/_markupsafe/__init__.py | 225 +++ .../ambari_jinja2/_markupsafe/_bundle.py | 49 + .../ambari_jinja2/_markupsafe/_constants.py | 267 +++ .../ambari_jinja2/_markupsafe/_native.py | 45 + .../ambari_jinja2/_markupsafe/tests.py | 80 + .../ambari_jinja2/ambari_jinja2/_stringdefs.py | 130 ++ .../ambari_jinja2/ambari_jinja2/bccache.py | 280 +++ .../ambari_jinja2/ambari_jinja2/compiler.py | 1640 ++++++++++++++++++ .../ambari_jinja2/ambari_jinja2/constants.py | 32 + .../python/ambari_jinja2/ambari_jinja2/debug.py | 308 ++++ .../ambari_jinja2/ambari_jinja2/defaults.py | 40 + .../ambari_jinja2/ambari_jinja2/environment.py | 1118 ++++++++++++ .../ambari_jinja2/ambari_jinja2/exceptions.py | 143 ++ .../python/ambari_jinja2/ambari_jinja2/ext.py | 610 +++++++ .../ambari_jinja2/ambari_jinja2/filters.py | 719 ++++++++ .../python/ambari_jinja2/ambari_jinja2/lexer.py | 681 ++++++++ .../ambari_jinja2/ambari_jinja2/loaders.py | 449 +++++ .../python/ambari_jinja2/ambari_jinja2/meta.py | 102 ++ .../python/ambari_jinja2/ambari_jinja2/nodes.py | 901 ++++++++++ .../ambari_jinja2/ambari_jinja2/optimizer.py | 68 + .../ambari_jinja2/ambari_jinja2/parser.py | 896 ++++++++++ .../ambari_jinja2/ambari_jinja2/runtime.py | 544 ++++++ .../ambari_jinja2/ambari_jinja2/sandbox.py | 271 +++ .../python/ambari_jinja2/ambari_jinja2/tests.py | 146 ++ .../ambari_jinja2/testsuite/__init__.py | 95 + .../ambari_jinja2/testsuite/api.py | 240 +++ .../ambari_jinja2/testsuite/core_tags.py | 286 +++ .../ambari_jinja2/testsuite/debug.py | 60 + .../ambari_jinja2/testsuite/doctests.py | 29 + .../ambari_jinja2/testsuite/ext.py | 455 +++++ .../ambari_jinja2/testsuite/filters.py | 291 ++++ .../ambari_jinja2/testsuite/imports.py | 144 ++ .../ambari_jinja2/testsuite/inheritance.py | 208 +++ .../ambari_jinja2/testsuite/lexnparse.py | 390 +++++ .../ambari_jinja2/testsuite/loader.py | 191 ++ .../ambari_jinja2/testsuite/regression.py | 258 +++ .../testsuite/res/templates/broken.html | 3 + .../testsuite/res/templates/foo/test.html | 1 + .../testsuite/res/templates/syntaxerror.html | 4 + .../testsuite/res/templates/test.html | 1 + .../ambari_jinja2/testsuite/security.py | 134 ++ .../ambari_jinja2/testsuite/tests.py | 87 + .../ambari_jinja2/testsuite/utils.py | 85 + .../python/ambari_jinja2/ambari_jinja2/utils.py | 601 +++++++ .../ambari_jinja2/ambari_jinja2/visitor.py | 87 + .../python/ambari_jinja2/artwork/jinjalogo.svg | 132 ++ .../custom_fixers/fix_alt_unicode.py | 13 + .../custom_fixers/fix_broken_reraising.py | 21 + .../ambari_jinja2/custom_fixers/fix_xrange2.py | 11 + .../src/main/python/ambari_jinja2/docs/Makefile | 75 + .../python/ambari_jinja2/docs/_static/jinja.js | 26 + .../python/ambari_jinja2/docs/_static/print.css | 5 + .../python/ambari_jinja2/docs/_static/style.css | 390 +++++ .../ambari_jinja2/docs/_templates/genindex.html | 36 + .../ambari_jinja2/docs/_templates/layout.html | 77 + .../docs/_templates/opensearch.xml | 9 + .../ambari_jinja2/docs/_templates/page.html | 4 + .../ambari_jinja2/docs/_templates/search.html | 35 + .../src/main/python/ambari_jinja2/docs/api.rst | 787 +++++++++ .../ambari_jinja2/docs/cache_extension.py | 56 + .../python/ambari_jinja2/docs/changelog.rst | 3 + .../src/main/python/ambari_jinja2/docs/conf.py | 141 ++ .../python/ambari_jinja2/docs/extensions.rst | 347 ++++ .../src/main/python/ambari_jinja2/docs/faq.rst | 191 ++ .../main/python/ambari_jinja2/docs/index.rst | 27 + .../python/ambari_jinja2/docs/integration.rst | 88 + .../main/python/ambari_jinja2/docs/intro.rst | 168 ++ .../main/python/ambari_jinja2/docs/jinjaext.py | 192 ++ .../main/python/ambari_jinja2/docs/sandbox.rst | 46 + .../python/ambari_jinja2/docs/switching.rst | 242 +++ .../python/ambari_jinja2/docs/templates.rst | 1365 +++++++++++++++ .../main/python/ambari_jinja2/docs/tricks.rst | 100 ++ .../ambari_jinja2/examples/basic/cycle.py | 13 + .../ambari_jinja2/examples/basic/debugger.py | 7 + .../ambari_jinja2/examples/basic/inheritance.py | 12 + .../examples/basic/templates/broken.html | 6 + .../examples/basic/templates/subbroken.html | 3 + .../python/ambari_jinja2/examples/basic/test.py | 27 + .../basic/test_filter_and_linestatements.py | 25 + .../examples/basic/test_loop_filter.py | 12 + .../ambari_jinja2/examples/basic/translate.py | 6 + .../main/python/ambari_jinja2/examples/bench.py | 433 +++++ .../python/ambari_jinja2/examples/profile.py | 52 + .../examples/rwbench/django/_form.html | 1 + .../examples/rwbench/django/_input_field.html | 1 + .../examples/rwbench/django/_textarea.html | 1 + .../examples/rwbench/django/index.html | 29 + .../examples/rwbench/django/layout.html | 29 + .../ambari_jinja2/examples/rwbench/djangoext.py | 135 ++ .../examples/rwbench/genshi/helpers.html | 12 + .../examples/rwbench/genshi/index.html | 41 + .../examples/rwbench/genshi/layout.html | 30 + .../examples/rwbench/jinja/helpers.html | 12 + .../examples/rwbench/jinja/index.html | 29 + .../examples/rwbench/jinja/layout.html | 29 + .../examples/rwbench/mako/helpers.html | 11 + .../examples/rwbench/mako/index.html | 31 + .../examples/rwbench/mako/layout.html | 30 + .../ambari_jinja2/examples/rwbench/rwbench.py | 112 ++ .../python/ambari_jinja2/ext/Vim/htmljinja.vim | 27 + .../main/python/ambari_jinja2/ext/Vim/jinja.vim | 113 ++ .../ext/django2jinja/django2jinja.py | 768 ++++++++ .../ambari_jinja2/ext/django2jinja/example.py | 7 + .../ext/django2jinja/templates/index.html | 58 + .../ext/django2jinja/templates/layout.html | 4 + .../ext/django2jinja/templates/subtemplate.html | 1 + .../python/ambari_jinja2/ext/djangojinja2.py | 86 + .../python/ambari_jinja2/ext/inlinegettext.py | 78 + .../src/main/python/ambari_jinja2/ext/jinja.el | 213 +++ .../main/python/ambari_jinja2/jinja2-debug.py | 40 + .../main/python/ambari_jinja2/scripts/pylintrc | 301 ++++ .../src/main/python/ambari_jinja2/setup.cfg | 6 + .../src/main/python/ambari_jinja2/setup.py | 110 ++ ambari-common/src/main/python/jinja2/AUTHORS | 31 - ambari-common/src/main/python/jinja2/CHANGES | 235 --- ambari-common/src/main/python/jinja2/LICENSE | 31 - .../src/main/python/jinja2/MANIFEST.in | 12 - ambari-common/src/main/python/jinja2/Makefile | 4 - .../main/python/jinja2/artwork/jinjalogo.svg | 132 -- .../python/jinja2/custom_fixers/__init__.py | 0 .../jinja2/custom_fixers/fix_alt_unicode.py | 13 - .../custom_fixers/fix_broken_reraising.py | 21 - .../python/jinja2/custom_fixers/fix_xrange2.py | 11 - .../src/main/python/jinja2/docs/Makefile | 75 - .../src/main/python/jinja2/docs/_build/.ignore | 0 .../src/main/python/jinja2/docs/_static/.ignore | 0 .../main/python/jinja2/docs/_static/jinja.js | 26 - .../main/python/jinja2/docs/_static/print.css | 5 - .../main/python/jinja2/docs/_static/style.css | 390 ----- .../main/python/jinja2/docs/_templates/.ignore | 0 .../python/jinja2/docs/_templates/genindex.html | 36 - .../python/jinja2/docs/_templates/layout.html | 77 - .../jinja2/docs/_templates/opensearch.xml | 9 - .../python/jinja2/docs/_templates/page.html | 4 - .../python/jinja2/docs/_templates/search.html | 35 - .../src/main/python/jinja2/docs/api.rst | 787 --------- .../main/python/jinja2/docs/cache_extension.py | 56 - .../src/main/python/jinja2/docs/changelog.rst | 3 - .../src/main/python/jinja2/docs/conf.py | 141 -- .../src/main/python/jinja2/docs/extensions.rst | 347 ---- .../src/main/python/jinja2/docs/faq.rst | 191 -- .../src/main/python/jinja2/docs/index.rst | 27 - .../src/main/python/jinja2/docs/integration.rst | 88 - .../src/main/python/jinja2/docs/intro.rst | 168 -- .../src/main/python/jinja2/docs/jinjaext.py | 192 -- .../src/main/python/jinja2/docs/sandbox.rst | 46 - .../src/main/python/jinja2/docs/switching.rst | 242 --- .../src/main/python/jinja2/docs/templates.rst | 1365 --------------- .../src/main/python/jinja2/docs/tricks.rst | 100 -- .../main/python/jinja2/examples/basic/cycle.py | 13 - .../python/jinja2/examples/basic/debugger.py | 7 - .../python/jinja2/examples/basic/inheritance.py | 12 - .../jinja2/examples/basic/templates/broken.html | 6 - .../examples/basic/templates/subbroken.html | 3 - .../main/python/jinja2/examples/basic/test.py | 27 - .../basic/test_filter_and_linestatements.py | 25 - .../jinja2/examples/basic/test_loop_filter.py | 12 - .../python/jinja2/examples/basic/translate.py | 6 - .../src/main/python/jinja2/examples/bench.py | 433 ----- .../src/main/python/jinja2/examples/profile.py | 52 - .../jinja2/examples/rwbench/django/_form.html | 1 - .../examples/rwbench/django/_input_field.html | 1 - .../examples/rwbench/django/_textarea.html | 1 - .../jinja2/examples/rwbench/django/index.html | 29 - .../jinja2/examples/rwbench/django/layout.html | 29 - .../python/jinja2/examples/rwbench/djangoext.py | 135 -- .../jinja2/examples/rwbench/genshi/helpers.html | 12 - .../jinja2/examples/rwbench/genshi/index.html | 41 - .../jinja2/examples/rwbench/genshi/layout.html | 30 - .../jinja2/examples/rwbench/jinja/helpers.html | 12 - .../jinja2/examples/rwbench/jinja/index.html | 29 - .../jinja2/examples/rwbench/jinja/layout.html | 29 - .../jinja2/examples/rwbench/mako/helpers.html | 11 - .../jinja2/examples/rwbench/mako/index.html | 31 - .../jinja2/examples/rwbench/mako/layout.html | 30 - .../python/jinja2/examples/rwbench/rwbench.py | 112 -- .../main/python/jinja2/ext/Vim/htmljinja.vim | 27 - .../src/main/python/jinja2/ext/Vim/jinja.vim | 113 -- .../jinja2/ext/django2jinja/django2jinja.py | 768 -------- .../python/jinja2/ext/django2jinja/example.py | 7 - .../ext/django2jinja/templates/index.html | 58 - .../ext/django2jinja/templates/layout.html | 4 - .../ext/django2jinja/templates/subtemplate.html | 1 - .../src/main/python/jinja2/ext/djangojinja2.py | 86 - .../src/main/python/jinja2/ext/inlinegettext.py | 78 - .../src/main/python/jinja2/ext/jinja.el | 213 --- .../src/main/python/jinja2/jinja2-debug.py | 40 - .../src/main/python/jinja2/jinja2/__init__.py | 73 - .../main/python/jinja2/jinja2/_debugsupport.c | 78 - .../jinja2/jinja2/_markupsafe/__init__.py | 225 --- .../python/jinja2/jinja2/_markupsafe/_bundle.py | 49 - .../jinja2/jinja2/_markupsafe/_constants.py | 267 --- .../python/jinja2/jinja2/_markupsafe/_native.py | 45 - .../python/jinja2/jinja2/_markupsafe/tests.py | 80 - .../main/python/jinja2/jinja2/_stringdefs.py | 130 -- .../src/main/python/jinja2/jinja2/bccache.py | 280 --- .../src/main/python/jinja2/jinja2/compiler.py | 1640 ------------------ .../src/main/python/jinja2/jinja2/constants.py | 32 - .../src/main/python/jinja2/jinja2/debug.py | 308 ---- .../src/main/python/jinja2/jinja2/defaults.py | 40 - .../main/python/jinja2/jinja2/environment.py | 1118 ------------ .../src/main/python/jinja2/jinja2/exceptions.py | 143 -- .../src/main/python/jinja2/jinja2/ext.py | 610 ------- .../src/main/python/jinja2/jinja2/filters.py | 719 -------- .../src/main/python/jinja2/jinja2/lexer.py | 681 -------- .../src/main/python/jinja2/jinja2/loaders.py | 449 ----- .../src/main/python/jinja2/jinja2/meta.py | 102 -- .../src/main/python/jinja2/jinja2/nodes.py | 901 ---------- .../src/main/python/jinja2/jinja2/optimizer.py | 68 - .../src/main/python/jinja2/jinja2/parser.py | 896 ---------- .../src/main/python/jinja2/jinja2/runtime.py | 544 ------ .../src/main/python/jinja2/jinja2/sandbox.py | 271 --- .../src/main/python/jinja2/jinja2/tests.py | 146 -- .../python/jinja2/jinja2/testsuite/__init__.py | 95 - .../main/python/jinja2/jinja2/testsuite/api.py | 240 --- .../python/jinja2/jinja2/testsuite/core_tags.py | 286 --- .../python/jinja2/jinja2/testsuite/debug.py | 60 - .../python/jinja2/jinja2/testsuite/doctests.py | 29 - .../main/python/jinja2/jinja2/testsuite/ext.py | 455 ----- .../python/jinja2/jinja2/testsuite/filters.py | 291 ---- .../python/jinja2/jinja2/testsuite/imports.py | 144 -- .../jinja2/jinja2/testsuite/inheritance.py | 208 --- .../python/jinja2/jinja2/testsuite/lexnparse.py | 390 ----- .../python/jinja2/jinja2/testsuite/loader.py | 191 -- .../jinja2/jinja2/testsuite/regression.py | 258 --- .../jinja2/jinja2/testsuite/res/__init__.py | 0 .../jinja2/testsuite/res/templates/broken.html | 3 - .../testsuite/res/templates/foo/test.html | 1 - .../testsuite/res/templates/syntaxerror.html | 4 - .../jinja2/testsuite/res/templates/test.html | 1 - .../python/jinja2/jinja2/testsuite/security.py | 134 -- .../python/jinja2/jinja2/testsuite/tests.py | 87 - .../python/jinja2/jinja2/testsuite/utils.py | 85 - .../src/main/python/jinja2/jinja2/utils.py | 601 ------- .../src/main/python/jinja2/jinja2/visitor.py | 87 - .../src/main/python/jinja2/scripts/pylintrc | 301 ---- ambari-common/src/main/python/jinja2/setup.cfg | 6 - ambari-common/src/main/python/jinja2/setup.py | 110 -- .../core/providers/__init__.py | 2 +- .../python/resource_management/core/source.py | 2 +- .../python/resource_management/core/system.py | 4 +- .../libraries/providers/__init__.py | 4 +- .../libraries/providers/monitor_webserver.py | 2 +- .../libraries/providers/repository.py | 2 +- ambari-server/pom.xml | 4 +- .../server/api/services/AmbariMetaInfo.java | 2 +- .../server/configuration/Configuration.java | 8 +- .../apache/ambari/server/orm/dao/GroupDAO.java | 1 + .../apache/ambari/server/orm/dao/UserDAO.java | 1 + .../authorization/AmbariLdapDataPopulator.java | 5 +- .../org/apache/ambari/server/state/Host.java | 2 +- .../server/state/stack/LatestRepoCallable.java | 2 +- .../ambari/server/state/stack/OsFamily.java | 6 +- .../server/upgrade/UpgradeCatalog161.java | 22 + ambari-server/src/main/python/ambari-server.py | 2 + .../src/main/python/ambari_server/utils.py | 12 +- ambari-server/src/main/python/bootstrap.py | 14 +- ambari-server/src/main/python/setupAgent.py | 8 +- ambari-server/src/main/resources/os_family.json | 2 +- .../main/resources/scripts/kerberos-setup.sh | 4 +- .../src/main/resources/scripts/stack_advisor.py | 19 +- .../scripts/repo_initialization.py | 2 +- .../before-INSTALL/templates/repo_debian.j2 | 1 - .../before-INSTALL/templates/repo_ubuntu.j2 | 1 + .../HBASE/package/scripts/hbase_decommission.py | 62 +- .../services/HBASE/package/scripts/params.py | 1 + .../stacks/HDP/1.3.2/services/stack_advisor.py | 377 +--- .../stacks/HDP/1.3.3/services/stack_advisor.py | 4 - .../stacks/HDP/1.3/services/stack_advisor.py | 4 - .../scripts/repo_initialization.py | 2 +- .../before-INSTALL/templates/repo_debian.j2 | 1 - .../before-INSTALL/templates/repo_ubuntu.j2 | 1 + .../HDP/2.0.6/services/GANGLIA/metainfo.xml | 2 +- .../GANGLIA/package/scripts/functions.py | 4 +- .../GANGLIA/package/scripts/ganglia_server.py | 2 +- .../services/GANGLIA/package/scripts/params.py | 4 +- .../HBASE/package/scripts/hbase_decommission.py | 62 +- .../services/HBASE/package/scripts/params.py | 1 + .../stacks/HDP/2.0.6/services/HDFS/metainfo.xml | 2 +- .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 2 +- .../services/HIVE/package/scripts/params.py | 2 +- .../HIVE/package/scripts/status_params.py | 2 +- .../HDP/2.0.6/services/NAGIOS/metainfo.xml | 2 +- .../services/NAGIOS/package/scripts/nagios.py | 8 +- .../services/NAGIOS/package/scripts/params.py | 10 +- .../NAGIOS/package/templates/nagios.conf.j2 | 2 +- .../HDP/2.0.6/services/OOZIE/metainfo.xml | 2 +- .../services/OOZIE/package/files/oozieSmoke2.sh | 2 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 316 +--- .../2.1.GlusterFS/services/FLUME/metainfo.xml | 31 + .../2.1.GlusterFS/services/HBASE/metainfo.xml | 5 + .../2.1.GlusterFS/services/OOZIE/metainfo.xml | 4 +- .../2.1.GlusterFS/services/SQOOP/metainfo.xml | 3 + .../2.1.GlusterFS/services/YARN/metainfo.xml | 10 +- .../resources/stacks/HDP/2.1/repos/repoinfo.xml | 2 +- .../stacks/HDP/2.1/services/OOZIE/metainfo.xml | 2 +- .../stacks/HDP/2.1/services/SQOOP/metainfo.xml | 4 - .../stacks/HDP/2.1/services/stack_advisor.py | 64 +- .../resources/stacks/HDP/2.2.1/metainfo.xml | 23 + .../stacks/HDP/2.2.1/repos/repoinfo.xml | 67 + .../stacks/HDP/2.2.1/role_command_order.json | 85 + .../HDP/2.2.1/services/FALCON/metainfo.xml | 26 + .../HDP/2.2.1/services/FLUME/metainfo.xml | 26 + .../HDP/2.2.1/services/HBASE/metainfo.xml | 26 + .../stacks/HDP/2.2.1/services/HDFS/metainfo.xml | 27 + .../stacks/HDP/2.2.1/services/HIVE/metainfo.xml | 31 + .../HDP/2.2.1/services/OOZIE/metainfo.xml | 26 + .../stacks/HDP/2.2.1/services/PIG/metainfo.xml | 26 + .../HDP/2.2.1/services/SQOOP/metainfo.xml | 26 + .../HDP/2.2.1/services/STORM/metainfo.xml | 27 + .../stacks/HDP/2.2.1/services/TEZ/metainfo.xml | 26 + .../HDP/2.2.1/services/WEBHCAT/metainfo.xml | 26 + .../stacks/HDP/2.2.1/services/YARN/metainfo.xml | 31 + .../HDP/2.2.1/services/ZOOKEEPER/metainfo.xml | 26 + .../src/main/resources/stacks/stack_advisor.py | 271 +++ .../server/api/services/AmbariMetaInfoTest.java | 1 - .../AmbariManagementControllerTest.java | 4 +- .../AmbariLdapDataPopulatorTest.java | 22 +- .../server/upgrade/UpgradeCatalog161Test.java | 24 + .../src/test/python/TestAmbariServer.py | 11 +- ambari-server/src/test/python/TestBootstrap.py | 6 +- ambari-server/src/test/python/TestOSCheck.py | 12 +- ambari-server/src/test/python/TestSetupAgent.py | 64 +- .../src/test/python/TestStackAdvisor.py | 323 +++- ambari-server/src/test/python/TestUtils.py | 6 +- .../stacks/1.3.2/HBASE/test_hbase_master.py | 6 +- .../python/stacks/1.3.2/configs/default.json | 4 +- .../hooks/before-INSTALL/test_before_install.py | 83 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 6 +- .../stacks/2.0.6/common/test_stack_advisor.py | 6 +- .../python/stacks/2.0.6/configs/default.json | 5 +- .../hooks/before-INSTALL/test_before_install.py | 98 +- ambari-server/src/test/python/unitTests.py | 2 +- .../HDP/2.0.1/services/GANGLIA/metainfo.xml | 2 +- .../stacks/HDP/2.0.1/services/HDFS/metainfo.xml | 2 +- .../stacks/HDP/2.0.1/services/HIVE/metainfo.xml | 2 +- .../HDP/2.0.1/services/OOZIE/metainfo.xml | 2 +- .../HDP/2.0.5/services/GANGLIA/metainfo.xml | 2 +- .../stacks/HDP/2.0.5/services/HDFS/metainfo.xml | 2 +- .../stacks/HDP/2.0.5/services/HIVE/metainfo.xml | 2 +- .../HDP/2.0.5/services/OOZIE/metainfo.xml | 2 +- .../stacks/HDP/2.0.7/services/HIVE/metainfo.xml | 2 +- .../assets/data/wizard/stack/HDP_versions.json | 10 +- ambari-web/app/assets/test/tests.js | 1 + ambari-web/app/controllers/application.js | 4 + .../controllers/global/cluster_controller.js | 6 +- ambari-web/app/controllers/installer.js | 2 +- .../app/controllers/main/admin/repositories.js | 2 +- .../main/admin/security/add/step4.js | 3 + .../security/security_progress_controller.js | 6 +- ambari-web/app/controllers/main/host/details.js | 11 +- .../controllers/main/service/info/configs.js | 56 +- .../app/controllers/wizard/step3_controller.js | 2 +- .../app/controllers/wizard/step7_controller.js | 8 + .../app/controllers/wizard/step8_controller.js | 2 +- .../mappers/service_config_version_mapper.js | 1 + ambari-web/app/messages.js | 1 + ambari-web/app/models/service_config.js | 8 +- ambari-web/app/models/service_config_version.js | 9 +- ambari-web/app/router.js | 2 +- ambari-web/app/routes/main.js | 19 +- ambari-web/app/styles/application.less | 40 +- ambari-web/app/templates/application.hbs | 22 +- .../common/configs/config_history_flow.hbs | 16 +- .../templates/main/dashboard/config_history.hbs | 4 +- ambari-web/app/utils/blueprint.js | 6 +- .../views/common/configs/config_history_flow.js | 42 +- .../app/views/common/configs/services_config.js | 2 +- .../app/views/common/filter_combo_cleanable.js | 1 + ambari-web/app/views/main/menu.js | 37 +- ambari-web/app/views/main/service/menu.js | 2 +- .../views/common/filter_combo_cleanable_test.js | 42 + ambari-web/vendor/scripts/jquery.timeago.js | 6 +- .../jobs/src/main/resources/ui/Gruntfile.js | 13 - .../jobs/src/main/resources/ui/package.json | 1 - pom.xml | 2 + 392 files changed, 23368 insertions(+), 22538 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/91ae5f27/ambari-agent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/91ae5f27/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/91ae5f27/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/91ae5f27/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ----------------------------------------------------------------------
