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/09/09 03:36:53 UTC

[32/46] 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/844f82b2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/844f82b2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/844f82b2

Branch: refs/heads/pkinit-support
Commit: 844f82b2843a57ef754e17614a7ec04f76252f79
Parents: fd7f686 e0dd503
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 15:55:16 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 15:55:16 2015 +0800

----------------------------------------------------------------------
 .../kerby/kerberos/kerb/admin/Kadmin.java       | 45 +++++++++++++-------
 .../kerberos/kerb/server/SimpleKdcServer.java   | 17 ++++++--
 2 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------