svn commit: r1642436 - in /sling/site/trunk/content: downloads.list news.mdtext

[ju...@apache.org]

Author: justin
Date: Sat Nov 29 15:51:08 2014
New Revision: 1642436

URL: http://svn.apache.org/r1642436
Log:
merger 1.2.0 release

Modified:
    sling/site/trunk/content/downloads.list
    sling/site/trunk/content/news.mdtext

Modified: sling/site/trunk/content/downloads.list
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1642436&r1=1642435&r2=1642436&view=diff
==============================================================================
--- sling/site/trunk/content/downloads.list (original)
+++ sling/site/trunk/content/downloads.list Sat Nov 29 15:51:08 2014
@@ -113,7 +113,7 @@ Models Implementation|org.apache.sling.m
 Resource Access Security|org.apache.sling.resourceaccesssecurity|1.0.0
 Resource Collection|org.apache.sling.resourcecollection|1.0.0
 Resource Inventory|org.apache.sling.resource.inventory|1.0.2
-Resource Merger|org.apache.sling.resourcemerger|1.1.2
+Resource Merger|org.apache.sling.resourcemerger|1.2.0
 Resource Resolver|org.apache.sling.resourceresolver|1.1.8
 Rewriter|org.apache.sling.rewriter|1.0.4
 Path-based RTP sample|org.apache.sling.samples.path-based.rtp|2.0.4

Modified: sling/site/trunk/content/news.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1642436&r1=1642435&r2=1642436&view=diff
==============================================================================
--- sling/site/trunk/content/news.mdtext (original)
+++ sling/site/trunk/content/news.mdtext Sat Nov 29 15:51:08 2014
@@ -1,4 +1,5 @@
 Title: News
+* New Release: Apache Sling Resource Merger 1.2.0 (November 29th, 2014)
 * New Release: Apache Sling Resource Resolver 1.1.8 (November 27th, 2014)
 * New Release: Apache Sling Servlets Resolver 2.3.6, and Apache Sling Engine 2.3.10 (November 18th, 2014)
 * New Release: Apache Sling Servlets Resolver 2.3.4 (November 14th, 2014)