Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9055018C4F for ; Thu, 30 Apr 2015 06:37:10 +0000 (UTC) Received: (qmail 99085 invoked by uid 500); 30 Apr 2015 06:37:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 98964 invoked by uid 500); 30 Apr 2015 06:37:10 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 98941 invoked by uid 99); 30 Apr 2015 06:37:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 06:37:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F058E35B2; Thu, 30 Apr 2015 06:37:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drankye@apache.org To: commits@directory.apache.org Date: Thu, 30 Apr 2015 06:37:11 -0000 Message-Id: <7276299352c64ad081b377f0539db43b@git.apache.org> In-Reply-To: <9c91a716dbe04c2db3a59849c714aaa7@git.apache.org> References: <9c91a716dbe04c2db3a59849c714aaa7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] directory-kerby git commit: Merged some conflicts 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 Authored: Thu Apr 30 01:34:31 2015 +0800 Committer: Drankye 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 ----------------------------------------------------------------------