ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [17/17] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Mon, 05 Jun 2017 20:00:56 GMT
Merge branch 'trunk' into branch-feature-AMBARI-12556


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64e3ad77
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64e3ad77
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64e3ad77

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 64e3ad77685dd934324947225889e76429ad5813
Parents: cd3fb85 601a7cd
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Mon Jun 5 15:43:28 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Mon Jun 5 15:43:28 2017 -0400

----------------------------------------------------------------------
 .../scripts/controllers/users/UsersShowCtrl.js  |  13 ++
 .../ui/admin-web/app/views/users/show.html      |   5 +-
 .../src/main/python/ambari_agent/Controller.py  |   6 +-
 ambari-server/conf/unix/ambari.properties       |   4 +
 ambari-server/docs/configuration/index.md       |   5 +-
 .../ambari/server/agent/HeartBeatHandler.java   |  18 ++-
 .../server/configuration/Configuration.java     |  31 ++++-
 .../AmbariManagementControllerImpl.java         | 126 ++++++++++++++++++-
 .../server/controller/KerberosHelperImpl.java   |   6 +
 .../internal/ConfigGroupResourceProvider.java   |  41 ++++--
 .../internal/HostResourceProvider.java          |   2 +-
 .../listeners/tasks/TaskStatusListener.java     |   2 +-
 .../scheduler/ExecutionSchedulerImpl.java       |   2 +
 .../security/InternalSSLSocketFactory.java      | 112 +++++++++++++++++
 .../InternalSSLSocketFactoryNonTrusting.java    |  49 ++++++++
 .../InternalSSLSocketFactoryTrusting.java       |  48 +++++++
 .../kerberos/ADKerberosOperationHandler.java    |  34 +++--
 .../KerberosKDCSSLConnectionException.java      |  45 +++++++
 .../kerberos/TrustingSSLSocketFactory.java      | 101 ---------------
 .../server/state/cluster/ClusterImpl.java       |  13 +-
 .../svccomphost/ServiceComponentHostImpl.java   |   2 +-
 .../server/upgrade/UpgradeCatalog251.java       |  45 ++++++-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |   9 +-
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py    |   9 +-
 .../internal/UpgradeResourceProviderTest.java   |   1 -
 .../ADKerberosOperationHandlerTest.java         |  96 +++++++++++++-
 .../server/upgrade/UpgradeCatalog251Test.java   |  13 +-
 .../main/service/reassign/step3_controller.js   |   1 +
 .../app/controllers/wizard/step8_controller.js  |   3 +-
 .../app/styles/theme/bootstrap-ambari.css       |  18 +--
 .../stack_upgrade/upgrade_version_box_view.js   |   4 +-
 .../upgrade_version_box_view_test.js            |   4 +-
 .../view/filebrowser/DownloadService.java       |   9 +-
 .../ambari/view/hive2/actor/DeathWatch.java     |   5 +-
 .../view/hive2/client/NonPersistentCursor.java  |   4 +-
 .../ambari/view/hive20/actor/DeathWatch.java    |   7 +-
 .../view/hive20/client/NonPersistentCursor.java |   4 +-
 docs/src/site/site.xml                          |   2 +-
 38 files changed, 690 insertions(+), 209 deletions(-)
----------------------------------------------------------------------



Mime
View raw message