Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 B04E310B05 for ; Thu, 15 Aug 2013 19:42:44 +0000 (UTC) Received: (qmail 43896 invoked by uid 500); 15 Aug 2013 19:42:32 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 43858 invoked by uid 500); 15 Aug 2013 19:42:32 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 43843 invoked by uid 99); 15 Aug 2013 19:42:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 19:42:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 19:42:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C75E22388860; Thu, 15 Aug 2013 19:42:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1514456 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/SaslRpcServer.java Date: Thu, 15 Aug 2013 19:42:09 -0000 To: common-commits@hadoop.apache.org From: kihwal@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130815194209.C75E22388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kihwal Date: Thu Aug 15 19:42:09 2013 New Revision: 1514456 URL: http://svn.apache.org/r1514456 Log: svn merge -c 1514448 merging from trunk to branch-2.1-beta to fix HADOOP-9868. Also fix broken CHANGES.txt. Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1514456&r1=1514455&r2=1514456&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 15 19:42:09 2013 @@ -11,6 +11,12 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9787. ShutdownHelper util to shutdown threads and threadpools. (Karthik Kambatla via Sandy Ryza) + HADOOP-9803. Add a generic type parameter to RetryInvocationHandler. + (szetszwo) + + HADOOP-9821. ClientId should have getMsb/getLsb methods. + (Tsuyoshi OZAWA via jing9) + HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe) @@ -24,6 +30,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-8814. Replace string equals "" by String#isEmpty(). (Brandon Li via suresh) + HADOOP-9789. Support server advertised kerberos principals (daryn) + HADOOP-9802. Support Snappy codec on Windows. (cnauroth) OPTIMIZATIONS @@ -47,6 +55,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9675. use svn:eol-style native for html to prevent line ending issues (Colin Patrick McCabe) + HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via daryn) + HADOOP-9858. Remove unused private RawLocalFileSystem#execCommand method from branch-2. (cnauroth) @@ -58,30 +68,7 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9381. Document dfs cp -f option. (Keegan Witt, suresh via suresh) -Release 2.1.0-beta - 2013-08-06 - - INCOMPATIBLE CHANGES - - NEW FEATURES - - IMPROVEMENTS - - HADOOP-9803. Add a generic type parameter to RetryInvocationHandler. - (szetszwo) - - HADOOP-9821. ClientId should have getMsb/getLsb methods. - (Tsuyoshi OZAWA via jing9) - - HADOOP-9789. Support server advertised kerberos principals (daryn) - - OPTIMIZATIONS - - BUG FIXES - - HADOOP-9768. chown and chgrp reject users and groups with spaces on platforms - where spaces are otherwise acceptable. (cnauroth) - - HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via daryn) + HADOOP-9868. Server must not advertise kerberos realm. (daryn via kihwal) Release 2.1.0-beta - 2013-08-06 Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java?rev=1514456&r1=1514455&r2=1514456&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java Thu Aug 15 19:42:09 2013 @@ -104,7 +104,7 @@ public class SaslRpcServer { if (LOG.isDebugEnabled()) LOG.debug("Kerberos principal name is " + fullName); // don't use KerberosName because we don't want auth_to_local - String[] parts = fullName.split("[/@]", 2); + String[] parts = fullName.split("[/@]", 3); protocol = parts[0]; // should verify service host is present here rather than in create() // but lazy tests are using a UGI that isn't a SPN...