directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject [2/3] directory-kerby git commit: Merged some conflicts
Date Thu, 30 Apr 2015 06:37:11 GMT
Merged some conflicts


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/638e6c1e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/638e6c1e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/638e6c1e

Branch: refs/heads/master
Commit: 638e6c1e336651a6e81d3230095a85b0e6342d30
Parents: ca25821 e452f18
Author: Drankye <drankye@gmail.com>
Authored: Thu Apr 30 01:34:31 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Thu Apr 30 01:34:31 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java  | 2 +-
 .../java/org/apache/kerby/kerberos/tool/klist/Klist.java     | 8 ++++----
 .../org/apache/kerby/kerberos/tool/token/TokenCache.java     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/638e6c1e/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/impl/NettyKdcNetwork.java
----------------------------------------------------------------------


Mime
View raw message