svn commit: r1305678 - in /whirr/branches/branch-0.7: CHANGES.txt services/yarn/pom.xml

[to...@apache.org]

Author: tomwhite
Date: Mon Mar 26 23:41:58 2012
New Revision: 1305678

URL: http://svn.apache.org/viewvc?rev=1305678&view=rev
Log:
Merge -r 1305674:1305675 from trunk to branch-0.7. Fixes: WHIRR-570

Modified:
    whirr/branches/branch-0.7/CHANGES.txt
    whirr/branches/branch-0.7/services/yarn/pom.xml

Modified: whirr/branches/branch-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1305678&r1=1305677&r2=1305678&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Mon Mar 26 23:41:58 2012
@@ -36,6 +36,8 @@ Release 0.7.2
  
   BUG FIXES
 
+    WHIRR-570. Site generation fails for YARN. (tomwhite)
+
 Release 0.7.1 - 2012-02-23
 
   IMPROVEMENTS

Modified: whirr/branches/branch-0.7/services/yarn/pom.xml
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/yarn/pom.xml?rev=1305678&r1=1305677&r2=1305678&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/yarn/pom.xml (original)
+++ whirr/branches/branch-0.7/services/yarn/pom.xml Mon Mar 26 23:41:58 2012
@@ -94,4 +94,15 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>