ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [01/50] [abbrv] git commit: Merge branch 'trunk' into branch-alerts-dev
Date Mon, 06 Oct 2014 21:03:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0d953b468 -> 80bceaf3a


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/6ba11a2a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ba11a2a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ba11a2a

Branch: refs/heads/trunk
Commit: 6ba11a2a94d1646a08bf49215e6776870302325e
Parents: 7bb0194 3c13f40
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Mon Aug 25 08:31:55 2014 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Mon Aug 25 08:31:55 2014 -0400

----------------------------------------------------------------------
 .../scripts/controllers/users/UsersShowCtrl.js  |  65 +++--
 .../ui/admin-web/app/scripts/services/User.js   |   3 +-
 .../resources/ui/admin-web/app/styles/main.css  |  12 +-
 .../admin-web/app/views/ambariViews/create.html |   6 +-
 .../admin-web/app/views/ambariViews/edit.html   |  95 ++++----
 .../admin-web/app/views/ambariViews/list.html   |  81 -------
 .../app/views/ambariViews/listTable.html        |   2 +-
 .../app/views/clusters/manageAccess.html        |  75 +++---
 .../ui/admin-web/app/views/groups/list.html     |  10 +-
 .../ui/admin-web/app/views/users/show.html      |   2 +-
 ambari-admin/src/main/resources/view.xml        |   1 +
 .../libraries/providers/hdfs_directory.py       |   2 +-
 .../api/services/ConfigurationService.java      |   2 +-
 .../server/api/util/StackExtensionHelper.java   |  69 ++++--
 .../server/configuration/Configuration.java     |   8 -
 .../server/controller/AmbariHandlerList.java    | 151 ++++++++++++
 .../ambari/server/controller/AmbariServer.java  |  13 +-
 .../server/controller/ControllerModule.java     |   2 +
 .../server/controller/FailsafeHandlerList.java  |  40 +++-
 .../internal/ClientConfigResourceProvider.java  |   2 +-
 .../internal/ConfigGroupResourceProvider.java   |  26 +-
 .../internal/ViewInstanceResourceProvider.java  |   6 +-
 .../ambari/server/orm/dao/PrincipalDAO.java     |  16 +-
 .../apache/ambari/server/orm/dao/RoleDAO.java   |  69 ------
 .../ambari/server/orm/dao/ServiceConfigDAO.java |   9 +-
 .../apache/ambari/server/orm/dao/UserDAO.java   |   8 -
 .../server/orm/entities/ConfigGroupEntity.java  |  11 +
 .../server/orm/entities/PrincipalEntity.java    |   5 +
 .../ambari/server/orm/entities/RoleEntity.java  |  70 ------
 .../ambari/server/orm/entities/UserEntity.java  |  11 -
 .../server/orm/entities/ViewInstanceEntity.java |  20 ++
 .../AmbariLdapAuthoritiesPopulator.java         | 134 +----------
 .../AmbariLocalUserDetailsService.java          |   8 +-
 .../server/security/authorization/User.java     |   9 -
 .../server/security/authorization/Users.java    | 147 +-----------
 .../internal/InternalAuthenticationToken.java   |  30 ++-
 .../server/state/cluster/ClusterImpl.java       |   8 +-
 .../server/state/configgroup/ConfigGroup.java   |   4 +
 .../state/configgroup/ConfigGroupImpl.java      |  21 ++
 .../server/upgrade/UpgradeCatalog170.java       |  56 +++--
 .../server/view/ViewInstanceHandlerList.java    |  43 ++++
 .../apache/ambari/server/view/ViewRegistry.java |  58 ++---
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  16 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  16 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |  18 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |  20 +-
 .../src/main/resources/META-INF/persistence.xml |   1 -
 .../services/HBASE/package/scripts/params.py    |   1 +
 .../HDFS/package/scripts/hdfs_namenode.py       |   2 +-
 .../services/HDFS/package/scripts/params.py     |   1 +
 .../HIVE/package/scripts/hcat_service_check.py  |  27 ++-
 .../services/HIVE/package/scripts/params.py     |   1 +
 .../MAPREDUCE/configuration/core-site.xml       |  20 --
 .../MAPREDUCE/package/scripts/params.py         |   1 +
 .../services/OOZIE/package/scripts/params.py    |   1 +
 .../services/WEBHCAT/package/scripts/params.py  |   1 +
 .../services/HBASE/package/scripts/params.py    |   1 +
 .../HDFS/package/scripts/hdfs_namenode.py       |   2 +-
 .../services/HDFS/package/scripts/params.py     |   1 +
 .../HIVE/package/scripts/hcat_service_check.py  |  27 ++-
 .../HIVE/package/scripts/install_jars.py        |   2 +-
 .../services/HIVE/package/scripts/params.py     |   1 +
 .../services/OOZIE/package/scripts/params.py    |   1 +
 .../services/PIG/package/scripts/params.py      |   1 +
 .../services/WEBHCAT/package/scripts/params.py  |   1 +
 .../services/WEBHCAT/package/scripts/webhcat.py |   2 +-
 .../YARN/configuration-mapred/core-site.xml     |  20 --
 .../services/YARN/configuration/core-site.xml   |  20 --
 .../services/YARN/package/scripts/params.py     |   1 +
 .../services/FALCON/package/scripts/params.py   |   1 +
 .../services/YARN/package/scripts/params.py     |   1 +
 .../services/FALCON/package/scripts/params.py   |   1 +
 .../services/YARN/configuration/core-site.xml   |  20 --
 .../api/util/StackExtensionHelperTest.java      | 235 ++++++++-----------
 .../controller/AmbariHandlerListTest.java       | 107 +++++++++
 .../AmbariManagementControllerTest.java         |  11 -
 .../apache/ambari/server/orm/OrmTestHelper.java |  26 +-
 .../ambari/server/orm/dao/UserDAOTest.java      |  40 +---
 ...uthenticationProviderForDNWithSpaceTest.java |  38 ---
 .../AmbariLdapAuthenticationProviderTest.java   |  39 ---
 .../AmbariLdapDataPopulatorTest.java            |   2 -
 .../AmbariLocalUserDetailsServiceTest.java      |   7 -
 .../TestAmbariLdapAuthoritiesPopulator.java     | 212 +----------------
 .../security/authorization/TestUsers.java       |  87 -------
 .../server/upgrade/UpgradeCatalog170Test.java   |   8 +-
 .../ambari/server/upgrade/UpgradeTest.java      |   8 -
 .../ambari/server/view/ViewRegistryTest.java    |   8 +-
 .../1.3.2/HIVE/test_hive_service_check.py       |   3 +-
 .../python/stacks/1.3.2/configs/secured.json    |   3 +-
 .../2.0.6/HIVE/test_hive_service_check.py       |   3 +-
 .../python/stacks/2.0.6/configs/secured.json    |   5 +-
 .../test/python/stacks/2.1/configs/secured.json |   5 +-
 ambari-web/app/app.js                           |  31 +--
 ambari-web/app/config.js                        |   1 -
 .../controllers/global/cluster_controller.js    |   8 +-
 ambari-web/app/controllers/installer.js         |   7 -
 ambari-web/app/controllers/main.js              |   1 +
 .../app/controllers/main/admin/repositories.js  |   8 +-
 .../app/controllers/main/views_controller.js    |  80 ++++++-
 .../app/controllers/wizard/step5_controller.js  |  29 ++-
 .../app/controllers/wizard/step6_controller.js  |  35 +--
 ambari-web/app/mappers/stack_service_mapper.js  |   2 +
 ambari-web/app/mappers/users_mapper.js          |   2 +-
 ambari-web/app/messages.js                      |   2 -
 ambari-web/app/mixins.js                        |   1 +
 ambari-web/app/mixins/common/blueprint.js       |  70 ++++++
 ambari-web/app/router.js                        | 115 +++++----
 ambari-web/app/routes/add_service_routes.js     |   4 +-
 ambari-web/app/routes/installer.js              |   2 +-
 ambari-web/app/routes/main.js                   |  22 --
 ambari-web/app/routes/views.js                  |  53 +++++
 ambari-web/app/templates/application.hbs        |   6 +-
 ambari-web/app/utils/ajax/ajax.js               |   4 +-
 ambari-web/app/utils/blueprint.js               |   4 +
 ambari-web/app/views/main/admin/repositories.js |   4 +-
 ambari-web/app/views/main/menu.js               |   7 +-
 ambari-web/app/views/main/views_view.js         |   4 +-
 ambari-web/app/views/wizard/controls_view.js    |   1 +
 ambari-web/test/app_test.js                     |  14 +-
 .../test/controllers/wizard/step4_test.js       |   6 +-
 ambari-web/test/mappers/users_mapper_test.js    |   2 +-
 121 files changed, 1352 insertions(+), 1659 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ba11a2a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------

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

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

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

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

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

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

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


Mime
View raw message