Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d45f3864 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d45f3864 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d45f3864 Branch: refs/heads/trunk Commit: d45f3864176cc0c2901331037ab684d06c47af5c Parents: a840c24 254280c Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Dec 16 19:55:25 2014 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Dec 16 19:55:25 2014 +0200 ---------------------------------------------------------------------- .../kerberos/KerberosServerAction.java | 68 +++++++------- .../kerberos/KerberosServerActionTest.java | 96 ++++++++++++-------- 2 files changed, 92 insertions(+), 72 deletions(-) ----------------------------------------------------------------------
