ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [34/34] git commit: Merge branch 'trunk' into branch-alerts-dev
Date Thu, 18 Sep 2014 14:44:23 GMT
Merge branch 'trunk' into branch-alerts-dev

Conflicts:
	ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1018b17
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1018b17
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1018b17

Branch: refs/heads/branch-alerts-dev
Commit: f1018b176a64451c2d62fcd3e2f5238e4587ab02
Parents: a4e97aa 5fc5828
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Sep 18 10:43:23 2014 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Sep 18 10:43:23 2014 -0400

----------------------------------------------------------------------
 .../ui/admin-web/app/scripts/services/View.js   |  19 +--
 .../resources/ui/admin-web/app/styles/main.css  |  87 ++++++++++
 .../app/views/ambariViews/listTable.html        |  19 ++-
 ambari-admin/src/main/resources/view.xml        |   1 +
 .../resource_management/TestCopyFromLocal.py    |   8 +-
 .../ambari/groovy/client/AmbariClient.groovy    |   7 +-
 .../libraries/providers/copy_from_local.py      |  12 +-
 .../libraries/resources/copy_from_local.py      |   3 +-
 .../server/api/util/StackExtensionHelper.java   |   9 +-
 .../internal/ClientConfigResourceProvider.java  |  35 +++-
 .../server/orm/entities/AlertNoticeEntity.java  |  51 ++++--
 .../ambari/server/state/ConfigHelper.java       |  21 ++-
 .../server/state/cluster/ClusterImpl.java       |   3 +-
 .../server/upgrade/UpgradeCatalog161.java       |   1 -
 .../server/upgrade/UpgradeCatalog170.java       |  28 +++-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   7 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   7 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   7 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |   7 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   2 +-
 .../GANGLIA/configuration/ganglia-env.xml       |   5 +
 .../GANGLIA/package/scripts/ganglia_monitor.py  |   4 +-
 .../services/GANGLIA/package/scripts/params.py  |  24 +--
 .../HIVE/package/scripts/install_jars.py        |  28 ++--
 .../services/HIVE/package/scripts/params.py     |  11 +-
 .../services/NAGIOS/package/files/sys_logger.py |  30 ++--
 .../stacks/HDP/2.2.1/role_command_order.json    |   2 +-
 .../services/TEZ/configuration/tez-site.xml     |  29 ++++
 .../stacks/HDP/2.2/role_command_order.json      |   3 +-
 .../SLIDER/configuration/slider-client.xml      |  56 +++++++
 .../SLIDER/configuration/slider-log4j.xml       |  89 ++++++++++
 .../stacks/HDP/2.2/services/SLIDER/metainfo.xml |  72 ++++++++
 .../SLIDER/package/files/hbaseSmokeVerify.sh    |  34 ++++
 .../services/SLIDER/package/scripts/__init__.py |  19 +++
 .../services/SLIDER/package/scripts/params.py   |  45 +++++
 .../SLIDER/package/scripts/service_check.py     |  45 +++++
 .../services/SLIDER/package/scripts/slider.py   |  68 ++++++++
 .../SLIDER/package/scripts/slider_client.py     |  43 +++++
 .../SLIDER/package/templates/slider-wrapper.j2  |  42 +++++
 .../2.2/services/TEZ/configuration/tez-site.xml |  29 ++++
 .../ClientConfigResourceProviderTest.java       |  24 ++-
 .../server/orm/dao/AlertDefinitionDAOTest.java  |   1 +
 .../server/upgrade/UpgradeCatalog161Test.java   |   4 -
 .../server/upgrade/UpgradeCatalog170Test.java   | 114 ++++++++++---
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   3 +-
 .../stacks/2.2/SLIDER/test_slider_client.py     | 109 +++++++++++++
 .../test/python/stacks/2.2/configs/default.json | 115 +++++++++++++
 .../test/python/stacks/2.2/configs/secured.json |  79 +++++++++
 ambari-shell/ambari-groovy-shell/pom.xml        |  11 ++
 .../ambari/shell/commands/ConfigCommands.java   | 163 +++++++++++++++++++
 .../shell/completion/AbstractCompletion.java    |  34 ++++
 .../ambari/shell/completion/Blueprint.java      |   9 +-
 .../ambari/shell/completion/ConfigType.java     |  29 ++++
 .../apache/ambari/shell/completion/Host.java    |   9 +-
 .../apache/ambari/shell/completion/Service.java |  12 +-
 .../configuration/ConverterConfiguration.java   |   6 +
 .../shell/converter/AbstractConverter.java      |  63 +++++++
 .../shell/converter/BlueprintConverter.java     |  21 +--
 .../shell/converter/ConfigTypeConverter.java    |  45 +++++
 .../ambari/shell/converter/HostConverter.java   |  21 +--
 .../shell/converter/ServiceConverter.java       |  24 +--
 .../shell/commands/ConfigCommandsTest.java      |  98 +++++++++++
 .../src/test/resources/core-site.xml            |  13 ++
 ambari-web/app/controllers/application.js       |   8 +-
 ambari-web/app/controllers/main.js              |   1 -
 .../resourceManager/wizard_controller.js        |   1 -
 ambari-web/app/controllers/main/host/details.js |   9 +-
 .../controllers/main/service/info/configs.js    |  42 +++--
 .../main/service/reassign/step2_controller.js   |   1 +
 .../app/controllers/main/views_controller.js    |   6 +-
 .../app/controllers/wizard/step5_controller.js  |  10 +-
 .../app/controllers/wizard/step7_controller.js  |   5 +
 ambari-web/app/messages.js                      |   3 +-
 ambari-web/app/mixins/common/serverValidator.js |   1 +
 ambari-web/app/models/service_config_version.js |   2 +-
 ambari-web/app/routes/installer.js              |   1 +
 ambari-web/app/routes/main.js                   |   1 -
 ambari-web/app/routes/reassign_master_routes.js | 124 +++++++-------
 .../app/routes/rm_high_availability_routes.js   |  12 +-
 ambari-web/app/styles/application.less          |  22 ++-
 ambari-web/app/templates/application.hbs        |  27 ++-
 .../common/configs/config_history_flow.hbs      |  36 +---
 .../configs/config_recommendation_popup.hbs     |  40 ++++-
 .../common/configs/service_version_box.hbs      |  53 ++++++
 .../app/templates/common/custom_date_popup.hbs  |  39 +++++
 ambari-web/app/templates/main/host/summary.hbs  |   8 +
 .../wizard/step6/step6_issues_popup.hbs         |  44 ++---
 ambari-web/app/utils/ajax/ajax.js               |   2 +-
 ambari-web/app/utils/config.js                  |   2 +-
 ambari-web/app/views.js                         |   1 +
 .../views/common/configs/config_history_flow.js |  22 +++
 .../app/views/common/select_custom_date_view.js |  36 ++++
 ambari-web/app/views/main/host/summary.js       |  11 ++
 .../test/nagios/plugins/test_sys_logger.py      |  77 ++++++++-
 .../apache/ambari/view/slider/AlertField.java   |  62 +++++++
 .../apache/ambari/view/slider/AlertState.java   |  40 +++++
 .../apache/ambari/view/slider/SliderApp.java    |   9 +
 .../ambari/view/slider/SliderAppsAlerts.java    | 126 ++++++++++++++
 .../slider/SliderAppsViewControllerImpl.java    |  24 ++-
 .../rest/client/SliderAppMasterClient.java      |  38 +++--
 .../assets/data/resource/service_configs.json   |   2 +-
 .../createAppWizard/step1_controller.js         |   2 +-
 .../resources/ui/app/models/slider_app_alert.js |  43 ++---
 .../ui/app/templates/slider_app/summary.hbs     |   2 +-
 .../ui/app/views/slider_app/summary_view.js     |   2 +-
 105 files changed, 2565 insertions(+), 451 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1018b17/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------


Mime
View raw message