You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2014/11/29 16:51:23 UTC
svn commit: r930994 - in /websites/staging/sling/trunk/content: ./
downloads.html news.html
Author: buildbot
Date: Sat Nov 29 15:51:22 2014
New Revision: 930994
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Nov 29 15:51:22 2014
@@ -1 +1 @@
-1642308
+1642436
Modified: websites/staging/sling/trunk/content/downloads.html
==============================================================================
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Sat Nov 29 15:51:22 2014
@@ -795,9 +795,9 @@ incubator releases of Apache Sling, have
</tr>
<tr>
<td>Resource Merger</td>
-<td>1.1.2</td>
-<td><a href="[preferred]/sling/org.apache.sling.resourcemerger-1.1.2.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.1.2.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.1.2.jar.md5">md5</a>)</td>
-<td><a href="[preferred]/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.1.2-source-release.zip.md5">md5</a>)</td>
+<td>1.2.0</td>
+<td><a href="[preferred]/sling/org.apache.sling.resourcemerger-1.2.0.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.0.jar.md5">md5</a>)</td>
+<td><a href="[preferred]/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.resourcemerger-1.2.0-source-release.zip.md5">md5</a>)</td>
</tr>
<tr>
<td>Resource Resolver</td>
@@ -1076,7 +1076,7 @@ incubator releases of Apache Sling, have
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1642078 by asanso on Thu, 27 Nov 2014 10:37:59 +0000
+ Rev. 1642436 by justin on Sat, 29 Nov 2014 15:51:08 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/news.html
==============================================================================
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Sat Nov 29 15:51:22 2014
@@ -91,6 +91,7 @@
<h1>News</h1>
<ul>
+<li>New Release: Apache Sling Resource Merger 1.2.0 (November 29th, 2014)</li>
<li>New Release: Apache Sling Resource Resolver 1.1.8 (November 27th, 2014)</li>
<li>New Release: Apache Sling Servlets Resolver 2.3.6, and Apache Sling Engine 2.3.10 (November 18th, 2014)</li>
<li>New Release: Apache Sling Servlets Resolver 2.3.4 (November 14th, 2014)</li>
@@ -281,7 +282,7 @@
<li>Apache Sling has graduated into a top level project! (June 17, 2009)</li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1642078 by asanso on Thu, 27 Nov 2014 10:37:59 +0000
+ Rev. 1642436 by justin on Sat, 29 Nov 2014 15:51:08 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project