You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/11/20 04:13:28 UTC
[2/2] directory-kerby git commit: Merge remote-tracking branch
'asf/master'
Merge remote-tracking branch 'asf/master'
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/9063089c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/9063089c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/9063089c
Branch: refs/heads/master
Commit: 9063089c0347004b8200d2f8b6387fd061fd3011
Parents: 3fc6706 b071833
Author: plusplusjiajia <ji...@intel.com>
Authored: Fri Nov 20 11:19:48 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Fri Nov 20 11:19:48 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kerby/config/Conf.java | 4 +-
.../java/org/apache/kerby/config/Config.java | 2 +-
.../org/apache/kerby/config/ConfigImpl.java | 6 +-
.../kerby/kerberos/kerb/client/KrbConfig.java | 85 +++++-----
.../kerberos/kerb/client/KrbConfigKey.java | 60 +++-----
.../kerby/kerberos/kerb/common/Krb5Conf.java | 154 +++++++++++++++++++
.../kerberos/kerb/common/KrbConfHelper.java | 107 -------------
.../kerberos/kerb/common/SectionConfigKey.java | 31 ----
.../kerby/kerberos/kerb/server/KdcConfig.java | 80 ++++------
.../kerberos/kerb/server/KdcConfigKey.java | 44 ++----
10 files changed, 265 insertions(+), 308 deletions(-)
----------------------------------------------------------------------