You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/06 23:04:04 UTC
[42/50] [abbrv] git commit: Merge branch 'trunk' into
branch-alerts-dev
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/b9cca713
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9cca713
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9cca713
Branch: refs/heads/trunk
Commit: b9cca7137540a6233a016ccf8ff3eba4c119b2b6
Parents: a42b727 753fe29
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Sep 30 16:47:50 2014 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Sep 30 16:47:50 2014 -0400
----------------------------------------------------------------------
.../controllers/ambariViews/ViewsListCtrl.js | 36 ++++++
.../ui/admin-web/app/scripts/services/View.js | 18 +++
.../resources/ui/admin-web/app/styles/main.css | 18 ++-
.../ui/admin-web/app/views/leftNavbar.html | 6 +-
.../src/main/python/ambari_agent/ActionQueue.py | 4 +-
.../src/main/python/ambari_agent/Controller.py | 6 +-
ambari-server/conf/unix/ambari.properties | 2 +-
.../AmbariCustomCommandExecutionHelper.java | 12 ++
.../security/ldap/AmbariLdapDataPopulator.java | 109 ++++++++++++-----
ambari-server/src/main/python/ambari-server.py | 2 +-
.../1.3.2/hooks/after-INSTALL/scripts/hook.py | 1 -
.../1.3.2/hooks/after-INSTALL/scripts/params.py | 5 +-
.../scripts/shared_initialization.py | 37 ++----
.../hooks/before-ANY/files/changeToSecureUid.sh | 50 ++++++++
.../HDP/1.3.2/hooks/before-ANY/scripts/hook.py | 3 +
.../1.3.2/hooks/before-ANY/scripts/params.py | 102 ++++++++++++++++
.../before-ANY/scripts/shared_initialization.py | 58 +++++++++
.../before-INSTALL/files/changeToSecureUid.sh | 50 --------
.../1.3.2/hooks/before-INSTALL/scripts/hook.py | 1 -
.../scripts/shared_initialization.py | 35 ------
.../1.3.2/hooks/before-START/scripts/hook.py | 1 -
.../2.0.6/hooks/after-INSTALL/scripts/hook.py | 2 +-
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 5 +-
.../scripts/shared_initialization.py | 28 +----
.../hooks/before-ANY/files/changeToSecureUid.sh | 50 ++++++++
.../HDP/2.0.6/hooks/before-ANY/scripts/hook.py | 2 +
.../2.0.6/hooks/before-ANY/scripts/params.py | 108 ++++++++++++++++-
.../before-ANY/scripts/shared_initialization.py | 56 +++++++++
.../before-INSTALL/files/changeToSecureUid.sh | 50 --------
.../2.0.6/hooks/before-INSTALL/scripts/hook.py | 1 -
.../scripts/shared_initialization.py | 35 ------
.../2.0.6/hooks/before-START/scripts/hook.py | 1 -
.../2.0.6/hooks/before-START/scripts/params.py | 4 +-
.../services/FLUME/package/scripts/params.py | 4 +-
.../services/HBASE/package/scripts/params.py | 9 +-
.../services/HDFS/package/scripts/params.py | 4 +-
.../services/HIVE/package/scripts/params.py | 6 +-
.../services/HIVE/package/scripts/webhcat.py | 32 +++--
.../services/OOZIE/package/scripts/params.py | 4 +-
.../services/PIG/package/scripts/params.py | 4 +-
.../services/SQOOP/package/scripts/params.py | 4 +-
.../services/YARN/package/scripts/params.py | 4 +-
.../ZOOKEEPER/package/scripts/params.py | 4 +-
.../services/FALCON/package/scripts/params.py | 4 +-
.../services/STORM/package/scripts/params.py | 4 +-
.../HDP/2.2/configuration/cluster-env.xml | 29 +++++
.../services/HDFS/configuration/hadoop-env.xml | 29 -----
.../HIVE/configuration/webhcat-site.xml | 11 ++
.../services/SLIDER/package/scripts/params.py | 4 +-
.../ldap/AmbariLdapDataPopulatorTest.java | 32 +++++
.../1.3.2/configs/default.hbasedecom.json | 2 +-
.../python/stacks/1.3.2/configs/default.json | 2 +-
.../1.3.2/configs/default.non_gmetad_host.json | 2 +-
.../stacks/1.3.2/configs/default_client.json | 2 +-
.../python/stacks/1.3.2/configs/secured.json | 2 +-
.../stacks/1.3.2/configs/secured_client.json | 2 +-
.../1.3.2/configs/secured_no_jce_name.json | 2 +-
.../hooks/after-INSTALL/test_after_install.py | 13 --
.../1.3.2/hooks/before-ANY/test_before_any.py | 119 +++++++++++++++++++
.../hooks/before-INSTALL/test_before_install.py | 110 +----------------
.../stacks/2.0.6/HIVE/test_webhcat_server.py | 20 ++++
.../2.0.6/configs/default.hbasedecom.json | 2 +-
.../python/stacks/2.0.6/configs/default.json | 2 +-
.../2.0.6/configs/default.non_gmetad_host.json | 2 +-
.../stacks/2.0.6/configs/default_client.json | 2 +-
.../stacks/2.0.6/configs/flume_target.json | 2 +-
.../python/stacks/2.0.6/configs/ha_default.json | 2 +-
.../python/stacks/2.0.6/configs/ha_secured.json | 2 +-
.../python/stacks/2.0.6/configs/secured.json | 2 +-
.../stacks/2.0.6/configs/secured_client.json | 2 +-
.../2.0.6/configs/secured_no_jce_name.json | 2 +-
.../hooks/after-INSTALL/test_after_install.py | 13 --
.../2.0.6/hooks/before-ANY/test_before_any.py | 119 +++++++++++++++++++
.../hooks/before-INSTALL/test_before_install.py | 110 +----------------
.../test/python/stacks/2.1/configs/default.json | 2 +-
.../test/python/stacks/2.1/configs/secured.json | 2 +-
.../test/python/stacks/2.2/configs/default.json | 2 +-
.../test/python/stacks/2.2/configs/secured.json | 2 +-
ambari-web/app/app.js | 2 +
.../data/requests/host_check/jdk_name.json | 2 +-
ambari-web/app/controllers/application.js | 4 +-
.../controllers/global/cluster_controller.js | 22 ++++
ambari-web/app/controllers/main.js | 4 +-
ambari-web/app/controllers/main/host.js | 24 ----
.../app/controllers/main/host/add_controller.js | 1 +
ambari-web/app/controllers/main/host/details.js | 6 +-
.../controllers/main/service/info/configs.js | 10 +-
.../app/controllers/main/views_controller.js | 4 -
.../app/controllers/wizard/step3_controller.js | 8 +-
.../app/controllers/wizard/step7_controller.js | 4 +-
.../app/controllers/wizard/step8_controller.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 14 ++-
.../mappers/service_config_version_mapper.js | 1 +
ambari-web/app/mappers/stack_service_mapper.js | 7 +-
ambari-web/app/messages.js | 2 +-
ambari-web/app/mixins/common/serverValidator.js | 61 ++--------
ambari-web/app/models/repository.js | 2 +-
ambari-web/app/models/service_config_version.js | 23 +++-
ambari-web/app/routes/installer.js | 3 +-
ambari-web/app/routes/main.js | 3 +-
.../templates/main/host/component_filter.hbs | 6 +-
ambari-web/app/utils/ajax/ajax.js | 4 +-
ambari-web/app/utils/components.js | 33 ++++-
ambari-web/app/utils/helper.js | 15 +++
.../views/common/configs/config_history_flow.js | 19 ++-
ambari-web/app/views/main/host.js | 36 +++++-
ambari-web/app/views/main/views/details.js | 54 +++++++++
ambari-web/test/utils/date_test.js | 7 +-
.../main/dashboard/config_history_view_test.js | 24 ++--
.../slider-core/0.51.0/slider-core-0.51.0.jar | Bin 1146908 -> 1155217 bytes
.../slider/SliderAppsViewControllerImpl.java | 98 +++++++++------
.../createAppWizard/step3_controller.js | 20 ++--
.../createAppWizard/step4_controller.js | 59 +++++++--
.../src/main/resources/ui/app/helpers/ajax.js | 2 +-
.../ui/app/mappers/slider_apps_mapper.js | 1 +
.../ui/app/mixins/ajax_error_handler.js | 2 +-
.../main/resources/ui/app/styles/common.less | 3 +
.../main/resources/ui/app/styles/wizard.less | 44 +++----
.../resources/ui/app/templates/application.hbs | 2 +-
.../ui/app/templates/createAppWizard/step1.hbs | 10 +-
.../ui/app/templates/createAppWizard/step2.hbs | 8 +-
.../src/main/resources/ui/app/translations.js | 11 +-
.../resources/ui/app/views/application_view.js | 11 +-
.../ui/app/views/common/config_set_view.js | 7 +-
.../ui/app/views/create_app_wizard_view.js | 6 +-
dev-support/test-patch.sh | 62 ----------
pom.xml | 2 +-
127 files changed, 1477 insertions(+), 910 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9cca713/ambari-agent/src/main/python/ambari_agent/Controller.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9cca713/ambari-web/app/controllers/main/host.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9cca713/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------