You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2013/11/18 23:21:17 UTC

svn commit: r1543197 - in /hadoop/common/branches/branch-2.2/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt

Author: arp
Date: Mon Nov 18 22:21:17 2013
New Revision: 1543197

URL: http://svn.apache.org/r1543197
Log:
HADOOP-10110. Merging change r1543196 from branch-2 to branch-2.2

Modified:
    hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/pom.xml
    hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/pom.xml?rev=1543197&r1=1543196&r2=1543197&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/pom.xml (original)
+++ hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-auth/pom.xml Mon Nov 18 22:21:17 2013
@@ -55,6 +55,11 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
       <scope>test</scope>
     </dependency>

Modified: hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1543197&r1=1543196&r2=1543197&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt Mon Nov 18 22:21:17 2013
@@ -55,6 +55,9 @@ Release 2.2.1 - UNRELEASED
 
     HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
 
+    HADOOP-10110. hadoop-auth has a build break due to missing dependency.
+    (Chuan Liu via arp)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES