ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [29/29] git commit: Merge branch 'trunk' into branch-alerts-dev
Date Wed, 17 Sep 2014 12:34:19 GMT
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/a4e97aaa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4e97aaa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4e97aaa

Branch: refs/heads/branch-alerts-dev
Commit: a4e97aaa2df20b7434676dbdcc8afa9f28bdc84d
Parents: b7ae2d7 24f0b47
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Wed Sep 17 08:33:22 2014 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Wed Sep 17 08:33:22 2014 -0400

----------------------------------------------------------------------
 .../app/scripts/controllers/mainCtrl.js         |   13 +-
 .../resources/ui/admin-web/app/styles/main.css  |   42 +-
 .../resources/ui/admin-web/app/views/main.html  |   41 +-
 .../src/main/python/ambari_jinja2/ext/jinja.el  |  213 -
 .../server/actionmanager/ActionScheduler.java   |   26 +-
 .../ambari/server/actionmanager/Request.java    |   23 +-
 .../server/api/util/StackExtensionHelper.java   |   35 +-
 .../server/controller/ExecuteActionRequest.java |   20 +-
 .../controller/MaintenanceStateHelper.java      |    2 +-
 .../internal/ConfigGroupResourceProvider.java   |   20 +-
 .../internal/RequestResourceProvider.java       |   12 +-
 .../server/orm/entities/RequestEntity.java      |   12 +
 .../server/upgrade/UpgradeCatalog170.java       |    4 +
 .../apache/ambari/server/view/ViewRegistry.java |   67 +-
 ambari-server/src/main/python/ambari-server.py  |   42 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    2 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |    2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |    2 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |    2 +-
 .../src/main/resources/properties.json          |    1 +
 .../HDFS/package/scripts/service_check.py       |    2 +-
 .../services/HIVE/configuration/hive-site.xml   |   19 +
 .../HDFS/package/scripts/service_check.py       |    2 +-
 .../services/HIVE/configuration/hive-site.xml   |   19 +
 .../stacks/HDP/2.0/role_command_order.json      |    2 +-
 .../stacks/HDP/2.0/services/HBASE/metainfo.xml  |    3 -
 .../stacks/HDP/2.0/services/HDFS/metainfo.xml   |    1 -
 .../stacks/HDP/2.0/services/HIVE/metainfo.xml   |    6 -
 .../stacks/HDP/2.0/services/OOZIE/metainfo.xml  |    3 -
 .../stacks/HDP/2.0/services/PIG/metainfo.xml    |    1 -
 .../stacks/HDP/2.0/services/SQOOP/metainfo.xml  |    3 -
 .../HDP/2.0/services/WEBHCAT/metainfo.xml       |   27 -
 .../stacks/HDP/2.0/services/YARN/metainfo.xml   |    2 -
 .../HDP/2.0/services/ZOOKEEPER/metainfo.xml     |    1 -
 .../GLUSTERFS/configuration/hadoop-env.xml      |    2 +
 .../services/HIVE/configuration/hive-site.xml   |   19 +
 .../services/YARN/configuration/core-site.xml   |   20 -
 .../stacks/HDP/2.1/services/FLUME/metainfo.xml  |    3 +-
 .../stacks/HDP/2.1/services/HBASE/metainfo.xml  |    3 -
 .../stacks/HDP/2.1/services/HDFS/metainfo.xml   |    1 -
 .../services/HIVE/configuration/hive-site.xml   |   19 +
 .../stacks/HDP/2.1/services/HIVE/metainfo.xml   |    1 -
 .../stacks/HDP/2.1/services/NAGIOS/metainfo.xml |    1 -
 .../stacks/HDP/2.1/services/OOZIE/metainfo.xml  |    2 -
 .../stacks/HDP/2.1/services/PIG/metainfo.xml    |    1 -
 .../stacks/HDP/2.1/services/SQOOP/metainfo.xml  |    3 -
 .../stacks/HDP/2.1/services/YARN/metainfo.xml   |    1 -
 .../HDP/2.1/services/ZOOKEEPER/metainfo.xml     |    2 -
 .../stacks/HDP/2.2.1/repos/repoinfo.xml         |    2 +-
 .../stacks/HDP/2.2.1/services/HDFS/metainfo.xml |    1 -
 .../stacks/HDP/2.2.1/services/HIVE/metainfo.xml |    1 -
 .../stacks/HDP/2.2/services/FALCON/metainfo.xml |    1 -
 .../stacks/HDP/2.2/services/FLUME/metainfo.xml  |    1 -
 .../stacks/HDP/2.2/services/HBASE/metainfo.xml  |    3 -
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml   |    1 -
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml   |    1 -
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml  |    2 -
 .../stacks/HDP/2.2/services/PIG/metainfo.xml    |    1 -
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml  |    3 -
 .../stacks/HDP/2.2/services/STORM/metainfo.xml  |    1 -
 .../stacks/HDP/2.2/services/TEZ/metainfo.xml    |    1 -
 .../HDP/2.2/services/WEBHCAT/metainfo.xml       |    1 -
 .../stacks/HDP/2.2/services/YARN/metainfo.xml   |    2 -
 .../HDP/2.2/services/ZOOKEEPER/metainfo.xml     |    1 -
 .../actionmanager/TestActionDBAccessorImpl.java |    2 +-
 .../actionmanager/TestActionScheduler.java      |  264 +-
 .../api/util/StackExtensionHelperTest.java      |   20 +
 .../AmbariCustomCommandExecutionHelperTest.java |    2 +-
 .../AmbariManagementControllerTest.java         |   86 +-
 .../BackgroundCustomCommandExecutionTest.java   |    2 +-
 .../ambari/server/view/ViewRegistryTest.java    |   90 +
 .../view/configuration/ViewConfigTest.java      |    1 +
 .../stacks/1.3.2/HDFS/test_service_check.py     |    2 +-
 .../stacks/2.0.6/HDFS/test_service_check.py     |    2 +-
 .../stacks/HDP/2.0.7/services/HDFS/metrics.json | 7840 ------------------
 ambari-web/app/controllers/installer.js         |   15 +
 .../controllers/main/service/info/configs.js    |  240 +-
 ambari-web/app/controllers/main/service/item.js |   36 +-
 ambari-web/app/data/HDP2/site_properties.js     |    9 +
 ambari-web/app/data/site_properties.js          |    9 +
 ambari-web/app/messages.js                      |    1 +
 ambari-web/app/models/cluster_states.js         |    1 -
 ambari-web/app/models/service_config.js         |    1 +
 ambari-web/app/router.js                        |   84 +-
 ambari-web/app/routes/installer.js              |   12 +-
 ambari-web/app/routes/reassign_master_routes.js |   96 +-
 .../common/configs/compare_property.hbs         |   30 +-
 .../common/configs/service_config_category.hbs  |    6 +-
 ambari-web/app/utils/ajax/ajax.js               |   17 +-
 .../app/utils/batch_scheduled_requests.js       |    6 +-
 contrib/views/slider/pom.xml                    |    2 +-
 .../slider/SliderAppTypesResourceProvider.java  |    6 +-
 .../view/slider/SliderAppsViewController.java   |    4 +
 .../slider/SliderAppsViewControllerImpl.java    |   70 +-
 .../view/slider/rest/SliderAppsResource.java    |   21 +-
 .../ambari/view/slider/rest/client/Metric.java  |    9 +-
 .../ui/app/controllers/slider_app_controller.js |   17 +-
 .../ui/app/controllers/slider_controller.js     |  107 +-
 .../src/main/resources/ui/app/helpers/ajax.js   |    6 +-
 .../src/main/resources/ui/app/initialize.js     |   31 +-
 .../ui/app/mappers/application_status.js        |  115 -
 .../ui/app/models/slider_app_component.js       |   10 +-
 .../resources/ui/app/styles/application.less    |  119 +
 .../resources/ui/app/templates/application.hbs  |    4 +-
 .../ui/app/templates/slider_app/summary.hbs     |    2 +-
 .../ui/app/templates/slider_title_tooltip.hbs   |   27 +
 .../src/main/resources/ui/app/translations.js   |    2 +-
 .../resources/ui/app/views/application_view.js  |   64 +
 108 files changed, 1641 insertions(+), 8622 deletions(-)
----------------------------------------------------------------------


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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4e97aaa/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4e97aaa/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------

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


Mime
View raw message