Return-Path: 
 <common-commits-return-17002-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
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 709749080
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Thu, 16 Feb 2012 18:35:57 +0000 (UTC)
Received: (qmail 30362 invoked by uid 500); 16 Feb 2012 18:35:57 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 30310 invoked by uid 500); 16 Feb 2012 18:35:57 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 30301 invoked by uid 99); 16 Feb 2012 18:35:57 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 18:35:57 +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, 16 Feb 2012 18:35:54 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2AED723888E7
	for <common-commits@hadoop.apache.org>; Thu, 16 Feb 2012 18:35:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1245117 - in /hadoop/common/branches/HDFS-1623: ./
 hadoop-project/pom.xml
Date: Thu, 16 Feb 2012 18:35:34 -0000
To: common-commits@hadoop.apache.org
From: atm@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120216183534.2AED723888E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: atm
Date: Thu Feb 16 18:35:32 2012
New Revision: 1245117

URL: http://svn.apache.org/viewvc?rev=1245117&view=rev
Log:
Merge trunk into HA branch.

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 18:35:32 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1244642
+/hadoop/common/trunk:1152502-1245115

Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1245117&r1=1245116&r2=1245117&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Thu Feb 16 18:35:32 2012
@@ -240,6 +240,17 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-client</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-minicluster</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>r09</version>