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 0601D1770A for ; Fri, 25 Sep 2015 02:40:11 +0000 (UTC) Received: (qmail 40466 invoked by uid 500); 25 Sep 2015 02:40:11 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40341 invoked by uid 500); 25 Sep 2015 02:40: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 40246 invoked by uid 99); 25 Sep 2015 02:40: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; Fri, 25 Sep 2015 02:40:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B51B0E0A2B; Fri, 25 Sep 2015 02:40: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: Fri, 25 Sep 2015 02:40:12 -0000 Message-Id: <68837d4844904df7b0b61a4c117baeee@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] directory-kerby git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/705775a1 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/705775a1 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/705775a1 Branch: refs/heads/master Commit: 705775a1583457fe17e405fa0730bfb419d0ac2c Parents: 217ac5e 675e792 Author: Kai Zheng Authored: Fri Sep 25 10:39:09 2015 +0800 Committer: Kai Zheng Committed: Fri Sep 25 10:39:09 2015 +0800 ---------------------------------------------------------------------- .../org/apache/kerby/kerberos/kdc/KerbyKdcServer.java | 9 ++++++--- .../kerb/identity/backend/MemoryIdentityBackend.java | 5 ++++- .../kerby/kerberos/kerb/server/request/KdcRequest.java | 5 ----- .../org/apache/kerby/kerberos/tool/kinit/KinitTool.java | 4 ++-- .../org/apache/kerby/kerberos/tool/klist/KlistTool.java | 4 ++-- .../apache/kerby/kerberos/tool/kadmin/KadminTool.java | 9 ++++++--- .../apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java | 12 ++++++++---- 7 files changed, 28 insertions(+), 20 deletions(-) ----------------------------------------------------------------------