Merge branch 'trunk' into branch-feature-AMBARI-18456

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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 18c74125a90169a88f712a7a48e15274e0fbb9e8
Parents: 10f44bc 9511638
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Wed Oct 12 10:41:42 2016 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Wed Oct 12 10:41:42 2016 -0400

----------------------------------------------------------------------
 .../server/controller/KerberosHelper.java       |  40 +++++-
 .../server/controller/KerberosHelperImpl.java   | 131 +++++++++----------
 .../AbstractPrepareKerberosServerAction.java    |  38 +++---
 .../ConfigureAmbariIdentitiesServerAction.java  |   2 +-
 .../resources/stacks/HDP/2.0.6/kerberos.json    |  40 ++++--
 .../stacks/HDP/2.3/services/HDFS/widgets.json   |  12 +-
 .../server/controller/KerberosHelperTest.java   |  84 ++++++++----
 7 files changed, 202 insertions(+), 145 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/18c74125/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
----------------------------------------------------------------------

Reply via email to