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 AE58A11185 for ; Thu, 19 Jun 2014 18:32:38 +0000 (UTC) Received: (qmail 86019 invoked by uid 500); 19 Jun 2014 18:32:38 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 85954 invoked by uid 500); 19 Jun 2014 18:32:38 -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 85945 invoked by uid 99); 19 Jun 2014 18:32:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 18:32:38 +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, 19 Jun 2014 18:32:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9BD39238889B for ; Thu, 19 Jun 2014 18:32:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603993 - /hadoop/common/branches/fs-encryption/ Date: Thu, 19 Jun 2014 18:32:14 -0000 To: common-commits@hadoop.apache.org From: wang@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140619183214.9BD39238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wang Date: Thu Jun 19 18:32:13 2014 New Revision: 1603993 URL: http://svn.apache.org/r1603993 Log: Merge from trunk to branch Modified: hadoop/common/branches/fs-encryption/ (props changed) Propchange: hadoop/common/branches/fs-encryption/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1603664-1603978