ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [44/44] git commit: Merge branch 'trunk' into branch-alerts-dev
Date Fri, 26 Sep 2014 16:48:59 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/73243741
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73243741
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73243741

Branch: refs/heads/branch-alerts-dev
Commit: 73243741b60846264bf6924387719418f04b7089
Parents: 7db82c9 20f112a
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Fri Sep 26 09:47:59 2014 -0700
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Fri Sep 26 09:47:59 2014 -0700

----------------------------------------------------------------------
 .../admin-web/app/views/ambariViews/create.html |   2 +-
 .../admin-web/app/views/ambariViews/edit.html   |   8 +-
 .../resource_management/TestCopyFromLocal.py    |   4 +-
 .../libraries/providers/copy_from_local.py      |   2 +-
 .../controller/AmbariManagementController.java  |  10 +-
 .../AmbariManagementControllerImpl.java         |  40 +-
 .../server/controller/LdapSyncRequest.java      |  94 ++
 .../BlueprintConfigurationProcessor.java        |  60 ++
 .../internal/ControllerResourceProvider.java    |  14 +-
 .../internal/DefaultProviderModule.java         |   2 +-
 .../internal/LdapSyncEventResourceProvider.java | 124 ++-
 .../apache/ambari/server/orm/DBAccessor.java    |   6 +-
 .../ambari/server/orm/DBAccessorImpl.java       |   5 +-
 .../ambari/server/orm/dao/PermissionDAO.java    |   2 +-
 .../orm/entities/LdapSyncEventEntity.java       | 127 ++-
 .../server/orm/entities/LdapSyncSpecEntity.java |  24 +-
 .../server/orm/helpers/dbms/DbmsHelper.java     |   7 +-
 .../server/orm/helpers/dbms/DerbyHelper.java    |   4 +-
 .../orm/helpers/dbms/GenericDbmsHelper.java     |   7 +-
 .../server/orm/helpers/dbms/MySqlHelper.java    |   5 +-
 .../server/orm/helpers/dbms/OracleHelper.java   |   4 +-
 .../server/orm/helpers/dbms/PostgresHelper.java |   4 +-
 .../server/state/cluster/ClusterImpl.java       |  13 +-
 .../server/upgrade/UpgradeCatalog170.java       |  17 +-
 .../HIVE/package/scripts/hive_service.py        |   1 +
 .../HIVE/package/scripts/service_check.py       |   1 +
 .../stacks/HDP/1.3.2/services/stack_advisor.py  |  10 +-
 .../YARN/configuration/capacity-scheduler.xml   |   8 +
 .../scripts/shared_initialization.py            |   5 +-
 .../services/HIVE/configuration/hive-site.xml   |   8 +-
 .../HIVE/package/scripts/hive_service.py        |   4 +-
 .../services/HIVE/package/scripts/params.py     |   2 +-
 .../HIVE/package/scripts/service_check.py       |   1 +
 .../YARN/configuration/capacity-scheduler.xml   |   8 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  10 +-
 .../GLUSTERFS/configuration/core-site.xml       |  11 -
 .../YARN/configuration/capacity-scheduler.xml   |   7 +
 .../FALCON/configuration/oozie-site.xml         |   9 +
 .../stacks/HDP/2.1/services/FLUME/metainfo.xml  |   2 +-
 .../services/OOZIE/configuration/oozie-site.xml |  11 -
 .../YARN/configuration/capacity-scheduler.xml   |   7 +
 .../stacks/HDP/2.1/services/stack_advisor.py    |  39 +-
 .../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 |  26 -
 .../stacks/HDP/2.2.1/services/HIVE/metainfo.xml |  26 -
 .../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 -
 .../services/TEZ/configuration/tez-site.xml     |  29 -
 .../stacks/HDP/2.2.1/services/TEZ/metainfo.xml  |  26 -
 .../stacks/HDP/2.2.1/services/YARN/metainfo.xml |  39 -
 .../HDP/2.2.1/services/ZOOKEEPER/metainfo.xml   |  26 -
 .../resources/stacks/HDP/2.2/repos/repoinfo.xml |  32 +-
 .../stacks/HDP/2.2/services/FALCON/metainfo.xml |   2 +-
 .../stacks/HDP/2.2/services/FLUME/metainfo.xml  |   4 +-
 .../stacks/HDP/2.2/services/HBASE/metainfo.xml  |   4 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   2 +-
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml   |   6 +-
 .../stacks/HDP/2.2/services/HIVE/metainfo.xml   |   8 +-
 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml  |   6 +-
 .../stacks/HDP/2.2/services/PIG/metainfo.xml    |   4 +-
 .../stacks/HDP/2.2/services/SLIDER/metainfo.xml |  16 +
 .../stacks/HDP/2.2/services/SQOOP/metainfo.xml  |   4 +-
 .../stacks/HDP/2.2/services/STORM/metainfo.xml  |   4 +-
 .../stacks/HDP/2.2/services/TEZ/metainfo.xml    |   4 +-
 .../stacks/HDP/2.2/services/YARN/metainfo.xml   |  10 +-
 .../HDP/2.2/services/ZOOKEEPER/metainfo.xml     |   4 +-
 .../src/main/resources/stacks/stack_advisor.py  |  90 +-
 .../AmbariManagementControllerImplTest.java     | 154 ++-
 .../server/controller/LdapSyncRequestTest.java  |  84 ++
 .../BlueprintConfigurationProcessorTest.java    |   9 +
 .../LdapSyncEventResourceProviderTest.java      |  28 +-
 .../ambari/server/orm/DBAccessorImplTest.java   |   6 +-
 .../orm/entities/LdapSyncEventEntityTest.java   |  47 +-
 .../orm/entities/LdapSyncSpecEntityTest.java    |  40 +-
 .../server/state/cluster/ClusterTest.java       |   5 +
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |   8 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   8 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |  12 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |   8 +-
 ambari-web/app/assets/test/tests.js             |   1 +
 ambari-web/app/config.js                        |   2 +-
 ambari-web/app/controllers/installer.js         | 253 ++---
 ambari-web/app/controllers/main/host/details.js |  14 +-
 ambari-web/app/controllers/wizard.js            |  30 +-
 .../app/controllers/wizard/step1_controller.js  |  12 +-
 .../app/controllers/wizard/step7_controller.js  |   6 +-
 .../app/controllers/wizard/step8_controller.js  |  56 +-
 ambari-web/app/data/HDP2/site_properties.js     |  30 +-
 ambari-web/app/data/site_properties.js          |  18 -
 ambari-web/app/mappers.js                       |   1 +
 ambari-web/app/mappers/stack_mapper.js          | 114 +++
 ambari-web/app/mappers/stack_service_mapper.js  |   2 +
 ambari-web/app/messages.js                      |   6 +-
 ambari-web/app/models.js                        |   3 +
 ambari-web/app/models/config_group.js           |  15 +-
 ambari-web/app/models/operating_system.js       |  33 +
 ambari-web/app/models/repository.js             |  67 ++
 ambari-web/app/models/service_config.js         |  15 +-
 ambari-web/app/models/stack.js                  |  70 ++
 ambari-web/app/models/stack_service.js          |   1 +
 ambari-web/app/routes/installer.js              |  32 +-
 ambari-web/app/styles/application.less          |   2 +-
 ambari-web/app/templates/wizard/step1.hbs       |  14 +-
 ambari-web/app/utils/components.js              |  12 +
 ambari-web/app/utils/date.js                    |   6 +-
 .../views/common/configs/config_history_flow.js |   3 +
 ambari-web/app/views/common/filter_view.js      |  20 +-
 ambari-web/app/views/common/table_view.js       |   1 +
 .../views/main/dashboard/config_history_view.js |   1 +
 ambari-web/app/views/main/dashboard/widgets.js  |   6 +
 .../dashboard/widgets/uptime_text_widget.js     |   2 +-
 ambari-web/app/views/wizard/step1_view.js       | 214 ++---
 ambari-web/test/controllers/installer_test.js   |  47 +-
 .../main/service/info/config_test.js            |  61 +-
 .../test/controllers/wizard/step7_test.js       |  46 +-
 .../test/controllers/wizard/step8_test.js       |  56 --
 ambari-web/test/mappers/stack_mapper_test.js    | 285 ++++++
 ambari-web/test/models/run_test.js              |  10 -
 ambari-web/test/stack.js                        | 265 ++++++
 ambari-web/test/utils/date_test.js              |  40 -
 ambari-web/test/utils/helper_test.js            |   4 +-
 ambari-web/test/views/wizard/step1_view_test.js | 633 +++++--------
 .../createAppWizard/step1_controller.js         |  52 +-
 .../createAppWizard/step2_controller.js         |  31 +-
 .../app/controllers/slider_apps_controller.js   |  15 +-
 .../ui/app/controllers/slider_controller.js     |   1 +
 .../src/main/resources/ui/app/helpers/ajax.js   |   7 +-
 .../src/main/resources/ui/app/initialize.js     |   7 +-
 .../ui/app/mappers/slider_apps_mapper.js        |  39 +-
 .../resources/ui/app/mixins/run_periodically.js |  37 +-
 .../ui/app/routes/create_app_wizard.js          |  19 +
 .../src/main/resources/ui/app/styles/app.less   | 276 ++++++
 .../resources/ui/app/styles/application.less    | 941 +------------------
 .../resources/ui/app/styles/application.styl    |   3 -
 .../resources/ui/app/styles/apps-table.less     | 320 +++++++
 .../main/resources/ui/app/styles/common.less    | 102 ++
 .../resources/ui/app/styles/old-bootstrap.less  | 164 ++++
 .../main/resources/ui/app/styles/wizard.less    | 205 ++++
 .../resources/ui/app/templates/application.hbs  |   2 +-
 .../ui/app/templates/createAppWizard.hbs        |   1 +
 .../ui/app/templates/createAppWizard/step1.hbs  | 152 ++-
 .../ui/app/templates/createAppWizard/step2.hbs  |  31 +-
 .../ui/app/templates/createAppWizard/step3.hbs  |   8 +-
 .../ui/app/templates/createAppWizard/step4.hbs  |   4 +-
 .../resources/ui/app/templates/slider_apps.hbs  |   2 +-
 .../ui/app/templates/unavailable_apps.hbs       |  19 +
 .../src/main/resources/ui/app/translations.js   |  26 +-
 .../ui/app/views/common/filter_view.js          |   4 +-
 .../ui/app/views/createAppWizard/step1_view.js  |  47 +-
 .../ui/app/views/createAppWizard/step2_view.js  |  15 +-
 .../ui/app/views/create_app_wizard_view.js      |  10 +
 ...test-patch-find-new-patch-available-jiras.sh |   0
 dev-support/test-patch.sh                       |   0
 160 files changed, 3874 insertions(+), 3043 deletions(-)
----------------------------------------------------------------------


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

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


Mime
View raw message