Revert HDFS-2189.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1152384 13f79535-47bb-0310-9956-ffa450edef68

hdfs/CHANGES.txt

@@ -594,9 +594,6 @@ Release 0.22.0 - Unreleased
     HDFS-1952. FSEditLog.open() appears to succeed even if all EDITS
     directories fail. (Andrew Wang via mattf)
 
-    HDFS-2189. Add guava-r09 dependency to ivy/hadoop-hdfs-template.xml
-    (Plamen Jeliazkov via shv)
-
     HDFS-1981. NameNode does not saveNamespace() when editsNew is empty.
     (Uma Maheswara Rao G via shv)
 

hdfs/ivy/hadoop-hdfs-template.xml

@@ -35,10 +35,5 @@
       <artifactId>hadoop-common</artifactId>
       <version>0.22.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>guava</artifactId>
-      <version>r09</version>
-    </dependency>
   </dependencies>
 </project>