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 Fri, 19 Sep 2014 17:19:37 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/e2e79668
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2e79668
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2e79668

Branch: refs/heads/branch-alerts-dev
Commit: e2e79668ed94266487fe9d1d2ccba2003922e883
Parents: 179290e d7ed431
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Fri Sep 19 13:18:45 2014 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Fri Sep 19 13:18:45 2014 -0400

----------------------------------------------------------------------
 .../clusters/ClustersManageAccessCtrl.js        |    2 +-
 .../app/scripts/directives/editableList.js      |   18 +-
 .../resources/ui/admin-web/app/styles/main.css  |   14 +-
 .../app/views/directives/editableList.html      |    2 +-
 .../ui/admin-web/app/views/groups/list.html     |    2 +-
 .../ui/admin-web/app/views/leftNavbar.html      |    9 +-
 .../resources/ui/admin-web/app/views/main.html  |    3 +-
 .../ui/admin-web/app/views/users/list.html      |    2 +-
 .../test/python/ambari_agent/TestController.py  |    4 +-
 .../TestCustomServiceOrchestrator.py            |    3 +-
 .../resource_management/TestCopyFromLocal.py    |    8 +-
 .../TestExecuteHadoopResource.py                |   12 +-
 .../resource_management/TestExecuteResource.py  |    3 +-
 .../core/providers/system.py                    |   12 +-
 .../python/resource_management/core/shell.py    |   24 +-
 .../libraries/providers/copy_from_local.py      |    4 +
 .../libraries/providers/execute_hadoop.py       |    6 +-
 .../libraries/providers/hdfs_directory.py       |    6 +-
 .../libraries/resources/copy_from_local.py      |    1 +
 ambari-server/pom.xml                           |    8 +
 .../server/api/util/StackExtensionHelper.java   |  122 +-
 .../controller/MaintenanceStateHelper.java      |    2 +-
 .../server/upgrade/UpgradeCatalog170.java       |   43 +-
 .../src/main/resources/properties.json          |    1 +
 .../1.3.2/hooks/before-START/scripts/params.py  |    2 +-
 .../services/HIVE/configuration/hcat-env.xml    |   57 +
 .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml |   19 +-
 .../1.3.2/services/HIVE/package/scripts/hcat.py |   13 +-
 .../services/HIVE/package/scripts/params.py     |    2 +
 .../HIVE/package/templates/hcat-env.sh.j2       |   44 -
 .../configuration/capacity-scheduler.xml        |    2 +-
 .../2.0.6/hooks/after-INSTALL/scripts/params.py |   11 +-
 .../scripts/shared_initialization.py            |    4 +
 .../2.0.6/hooks/before-START/scripts/params.py  |   13 +-
 .../services/FLUME/package/scripts/flume.py     |    2 +-
 .../services/FLUME/package/scripts/params.py    |    6 +-
 .../GANGLIA/configuration/ganglia-env.xml       |    2 +-
 .../services/GANGLIA/package/scripts/params.py  |    8 +-
 .../services/HBASE/package/scripts/params.py    |   16 +-
 .../services/HDFS/package/scripts/params.py     |   18 +-
 .../HDFS/package/scripts/service_check.py       |    2 +-
 .../services/HIVE/configuration/hcat-env.xml    |   57 +
 .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml |   19 +-
 .../2.0.6/services/HIVE/package/scripts/hcat.py |   15 +-
 .../HIVE/package/scripts/hcat_service_check.py  |   10 +-
 .../HIVE/package/scripts/install_jars.py        |    2 +
 .../services/HIVE/package/scripts/params.py     |   71 +-
 .../services/HIVE/package/scripts/webhcat.py    |    4 +
 .../HIVE/package/templates/hcat-env.sh.j2       |   43 -
 .../services/PIG/package/scripts/params.py      |   12 +-
 .../2.0.6/services/PIG/package/scripts/pig.py   |    1 +
 .../services/SQOOP/package/scripts/params.py    |   11 +-
 .../YARN/configuration/capacity-scheduler.xml   |    2 +-
 .../package/scripts/mapred_service_check.py     |    4 +
 .../services/YARN/package/scripts/params.py     |   24 +-
 .../YARN/package/scripts/service_check.py       |    2 +-
 .../ZOOKEEPER/package/scripts/params.py         |    7 +-
 .../services/FALCON/package/scripts/params.py   |   12 +-
 .../services/STORM/package/scripts/params.py    |   11 +-
 .../stacks/HDP/2.2/services/FALCON/metainfo.xml |    2 +-
 .../stacks/HDP/2.2/services/FLUME/metainfo.xml  |    2 +-
 .../stacks/HDP/2.2/services/HBASE/metainfo.xml  |    2 +-
 .../services/HDFS/configuration/hadoop-env.xml  |    2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   34 -
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml   |    4 +-
 .../HIVE/configuration/webhcat-site.xml         |   14 +-
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml   |    6 +-
 .../services/OOZIE/configuration/oozie-site.xml |   13 -
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml  |    6 +-
 .../stacks/HDP/2.2/services/PIG/metainfo.xml    |    2 +-
 .../services/SLIDER/package/scripts/params.py   |    4 +-
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml  |    2 +-
 .../services/STORM/configuration/storm-env.xml  |   29 -
 .../services/STORM/configuration/storm-site.xml |    6 +-
 .../stacks/HDP/2.2/services/STORM/metainfo.xml  |    2 +-
 .../stacks/HDP/2.2/services/TEZ/metainfo.xml    |    2 +-
 .../HDP/2.2/services/WEBHCAT/metainfo.xml       |   43 -
 .../YARN/configuration-mapred/mapred-site.xml   |   11 +-
 .../services/YARN/configuration/yarn-site.xml   |   11 +-
 .../stacks/HDP/2.2/services/YARN/metainfo.xml   |    6 +-
 .../HDP/2.2/services/ZOOKEEPER/metainfo.xml     |    2 +-
 .../api/util/StackExtensionHelperTest.java      |   40 +-
 .../stacks/1.3.2/HDFS/test_service_check.py     |    2 +-
 .../stacks/1.3.2/HIVE/test_hcat_client.py       |   20 +-
 .../python/stacks/1.3.2/configs/default.json    |    5 +-
 .../python/stacks/1.3.2/configs/secured.json    |    5 +-
 .../python/stacks/2.0.6/FLUME/test_flume.py     |    4 +-
 .../stacks/2.0.6/HDFS/test_service_check.py     |    2 +-
 .../stacks/2.0.6/HIVE/test_hcat_client.py       |   22 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |    9 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   12 +-
 .../2.0.6/HIVE/test_hive_service_check.py       |   17 +-
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |    8 +
 .../python/stacks/2.0.6/PIG/test_pig_client.py  |    2 +
 .../2.0.6/YARN/test_mapreduce2_service_check.py |    8 +
 .../2.0.6/YARN/test_yarn_service_check.py       |    4 +-
 .../python/stacks/2.0.6/configs/default.json    |    5 +-
 .../python/stacks/2.0.6/configs/secured.json    |    5 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |    8 +-
 .../services/YARN/configuration/yarn-site.xml   |    2 +-
 ambari-web/app/data/HDP2/site_properties.js     |   24 +
 ambari-web/app/data/site_properties.js          |   24 +
 ambari-web/app/messages.js                      |    1 +
 ambari-web/app/mixins/common/serverValidator.js |   11 +-
 ambari-web/app/models/service_config_version.js |    7 +-
 ambari-web/app/styles/application.less          |   51 +-
 .../common/configs/config_history_flow.hbs      |   20 +-
 .../common/configs/service_version_box.hbs      |   17 +-
 .../templates/main/dashboard/config_history.hbs |    6 +-
 ambari-web/app/utils/config.js                  |    2 +-
 .../views/common/configs/config_history_flow.js |   19 +-
 ambari-web/app/views/common/filter_view.js      |    8 +-
 .../views/main/dashboard/config_history_view.js |    4 +-
 contrib/views/slider/pom.xml                    |    9 +-
 .../ambari/view/slider/GangliaMetric.java       |  257 +++
 .../ambari/view/slider/MetricsHolder.java       |   44 +
 .../apache/ambari/view/slider/SliderApp.java    |   16 +-
 .../ambari/view/slider/SliderAppType.java       |   32 +-
 .../slider/SliderAppsViewControllerImpl.java    |   87 +-
 .../apache/ambari/view/slider/TemporalInfo.java |   48 +
 .../rest/client/SliderAppGangliaHelper.java     |  196 +++
 .../rest/client/SliderAppMasterClient.java      |  127 +-
 .../app/assets/data/resource/cluster_name.json  |   12 -
 .../assets/data/resource/components_hosts.json  |   16 -
 .../ui/app/assets/data/resource/empty_json.json |    1 +
 .../assets/data/resource/service_configs.json   |   38 -
 .../assets/data/resource/service_status.json    |   95 --
 .../assets/data/resource/slider-properties.json |    7 +-
 .../ui-bg_flat_0_aaaaaa_40x100.png              |  Bin 0 -> 180 bytes
 .../ui-bg_glass_55_fbf9ee_1x400.png             |  Bin 0 -> 120 bytes
 .../ui-bg_glass_65_ffffff_1x400.png             |  Bin 0 -> 105 bytes
 .../ui-bg_glass_75_dadada_1x400.png             |  Bin 0 -> 111 bytes
 .../ui-bg_glass_75_e6e6e6_1x400.png             |  Bin 0 -> 110 bytes
 .../ui-bg_glass_75_ffffff_1x400.png             |  Bin 0 -> 107 bytes
 .../ui-bg_highlight-soft_75_cccccc_1x100.png    |  Bin 0 -> 101 bytes
 .../ui-bg_inset-soft_95_fef1ec_1x100.png        |  Bin 0 -> 123 bytes
 .../ui-icons_222222_256x240.png                 |  Bin 0 -> 4369 bytes
 .../ui-icons_2e83ff_256x240.png                 |  Bin 0 -> 4369 bytes
 .../ui-icons_454545_256x240.png                 |  Bin 0 -> 4369 bytes
 .../ui-icons_888888_256x240.png                 |  Bin 0 -> 4369 bytes
 .../ui-icons_cd0a0a_256x240.png                 |  Bin 0 -> 4369 bytes
 .../ui-icons_f6cf3b_256x240.png                 |  Bin 0 -> 8884 bytes
 .../createAppWizard/step1_controller.js         |   90 +-
 .../createAppWizard/step4_controller.js         |   10 +-
 .../ui/app/controllers/slider_app_controller.js |   35 +-
 .../ui/app/controllers/slider_controller.js     |  305 +---
 .../src/main/resources/ui/app/helpers/ajax.js   |  133 +-
 .../src/main/resources/ui/app/initialize.js     |   11 +-
 .../ui/app/mappers/application_type.js          |    2 +-
 .../ui/app/mappers/slider_apps_mapper.js        |   41 +-
 .../ui/app/mixins/ajax_error_handler.js         |   84 +
 .../main/resources/ui/app/models/slider_app.js  |    5 +
 .../resources/ui/app/models/slider_config.js    |   51 +
 .../src/main/resources/ui/app/routes/main.js    |   16 +
 .../resources/ui/app/styles/application.less    |   80 +-
 .../resources/ui/app/templates/application.hbs  |   17 +-
 .../ui/app/templates/common/ajax_error.hbs      |   24 +
 .../resources/ui/app/templates/slider_app.hbs   |   26 +-
 .../ui/app/templates/slider_app/configs.hbs     |    2 +-
 .../resources/ui/app/templates/slider_apps.hbs  |   10 +-
 .../ui/app/templates/slider_title_tooltip.hbs   |    6 +-
 .../src/main/resources/ui/app/translations.js   |   22 +-
 .../resources/ui/app/views/application_view.js  |   18 +-
 .../views/slider_app/metrics/app_metric_view.js |   71 +
 .../ui/app/views/slider_app/summary_view.js     |   71 +-
 .../slider/src/main/resources/ui/config.js      |    1 +
 .../resources/ui/vendor/scripts/common/tv4.js   | 1605 ++++++++++++++++++
 .../views/slider/src/main/resources/view.xml    |   21 +-
 168 files changed, 3721 insertions(+), 1439 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e2e79668/ambari-agent/src/test/python/ambari_agent/TestController.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/e2e79668/ambari-server/pom.xml
----------------------------------------------------------------------

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

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


Mime
View raw message