You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sp...@apache.org on 2015/02/17 03:43:50 UTC
[2/2] ambari git commit: Merge branch 'trunk' of
http://git-wip-us.apache.org/repos/asf/ambari into trunk
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/ambari into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/976e4bcf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/976e4bcf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/976e4bcf
Branch: refs/heads/trunk
Commit: 976e4bcf7d090a4eb107a7d9f9c4908e0ca7c385
Parents: 3e0a9c9 fd07a3e
Author: sposetti <co...@yahoo.com>
Authored: Mon Feb 16 21:43:05 2015 -0500
Committer: sposetti <co...@yahoo.com>
Committed: Mon Feb 16 21:43:05 2015 -0500
----------------------------------------------------------------------
.../metrics2/sink/timeline/TimelineMetric.java | 8 +-
.../deserialize/IgnoringNullsLinkedHashMap.java | 34 ----
.../IgnoringNullsLinkedHashMapTest.java | 39 -----
.../src/main/python/core/host_info.py | 28 ++--
.../webapp/AHSWebApp.java | 5 +-
.../webapp/YarnAMSJacksonJaxbJsonProvider.java | 57 -------
.../kerberos/ADKerberosOperationHandler.java | 67 +++++++-
.../kerberos/KerberosOperationHandler.java | 24 +++
.../server/upgrade/UpgradeCatalog200.java | 9 +-
.../metrics2/sink/timeline/TimelineMetric.java | 10 +-
.../deserialize/IgnoringNullsLinkedHashMap.java | 35 ----
.../src/main/python/ambari_server_main.py | 14 +-
.../0.1.0/configuration/ams-hbase-env.xml | 6 +-
.../0.1.0/configuration/ams-hbase-site.xml | 2 +-
.../AMBARI_METRICS/0.1.0/metainfo.xml | 1 +
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 20 ++-
.../0.1.0/package/scripts/hbase.py | 16 +-
.../0.1.0/package/scripts/metrics_collector.py | 65 +++++++-
.../0.1.0/package/scripts/params.py | 35 ++--
.../0.1.0/package/scripts/params_linux.py | 4 +-
.../0.1.0/package/scripts/status_params.py | 13 +-
.../0.5.0.2.2/package/scripts/knox_gateway.py | 2 +-
.../KNOX/0.5.0.2.2/package/scripts/knox_ldap.py | 39 +++++
.../KNOX/0.5.0.2.2/package/scripts/ldap.py | 39 -----
.../SPARK/1.2.0.2.2/package/scripts/params.py | 1 +
.../YARN/2.1.0.2.0/configuration/yarn-site.xml | 8 +
.../KNOX/package/scripts/knox_gateway.py | 2 +-
.../services/KNOX/package/scripts/knox_ldap.py | 39 +++++
.../services/KNOX/package/scripts/ldap.py | 39 -----
.../stacks/HDP/2.2/role_command_order.json | 2 +-
.../ADKerberosOperationHandlerTest.java | 36 +++++
.../kerberos/KerberosOperationHandlerTest.java | 35 ++++
.../server/upgrade/UpgradeCatalog200Test.java | 9 ++
.../src/test/python/TestAmbariServer.py | 2 +-
ambari-web/app/config.js | 1 +
.../controllers/global/cluster_controller.js | 41 +++++
.../app/controllers/main/admin/kerberos.js | 28 +++-
.../main/admin/kerberos/disable_controller.js | 17 ++
.../main/admin/stack_and_upgrade_controller.js | 10 +-
.../app/controllers/main/host/add_controller.js | 15 --
.../controllers/main/service/add_controller.js | 38 ++---
.../app/controllers/wizard/step8_controller.js | 11 +-
.../app/controllers/wizard/step9_controller.js | 4 -
ambari-web/app/routes/add_host_routes.js | 60 +------
ambari-web/app/routes/add_kerberos_routes.js | 1 +
ambari-web/app/routes/main.js | 4 +-
ambari-web/app/utils/ajax/ajax.js | 28 ++--
ambari-web/app/utils/helper.js | 26 +++
.../app/views/main/service/info/summary.js | 3 +-
.../global/cluster_controller_test.js | 161 +++++++++++++++++++
.../admin/stack_and_upgrade_controller_test.js | 51 ++++++
.../test/controllers/wizard/step8_test.js | 23 ++-
ambari-web/test/utils/helper_test.js | 33 ++++
.../views/main/service/info/summary_test.js | 45 +++++-
pom.xml | 3 +-
55 files changed, 908 insertions(+), 440 deletions(-)
----------------------------------------------------------------------