Return-Path: 
 <cvs-return-24799-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 24519 invoked from network); 14 Oct 2005 21:08:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Oct 2005 21:08:04 -0000
Received: (qmail 55557 invoked by uid 500); 14 Oct 2005 21:08:03 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 55503 invoked by uid 500); 14 Oct 2005 21:08:03 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 55491 invoked by uid 99); 14 Oct 2005 21:08:03 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 14 Oct 2005 14:08:02 -0700
Received: (qmail 24420 invoked by uid 65534); 14 Oct 2005 21:07:42 -0000
Message-ID: <20051014210742.24419.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r321221 - /cocoon/trunk/status.xml
Date: Fri, 14 Oct 2005 21:07:42 -0000
To: cvs@cocoon.apache.org
From: rgoers@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgoers
Date: Fri Oct 14 14:07:40 2005
New Revision: 321221

URL: http://svn.apache.org/viewcvs?rev=321221&view=rev
Log:
Move statuses from 2.2 to 2.1.8

Modified:
    cocoon/trunk/status.xml

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=321221&r1=321220&r2=321221&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Oct 14 14:07:40 2005
@@ -198,9 +198,6 @@
 
   <changes>
   <release version="@version@" date="@date@">
-    <action dev="RG" type="fix" fixes-bug="32784">
-      Portal Block: Allow Full screen mode to show navigation.
-    </action>
     <action dev="LG" type="update">
       Improved blocks build exclusion/inclusion. See blocks.properties for more info.
     </action>
@@ -208,9 +205,6 @@
       Samples pages reorganized: the first page shows only the most important samples, selected
       in src/webapp/samples/blocks/samples-pages.xml, and another page shows all samples.
     </action>
-    <action dev="RG" type="fix" fixes-bug="34802" due-to="Roy Huang" due-to-email="roy_huang@nbmgroup.com">
-      Portal Block: PageLabelLinkService generated the wrong url when using 3 layer tabs with showallnav.
-    </action>
     <action dev="BD" type="update">
       Core samples moved to new blocks: core-samples-main and core-samples-additional.
     </action>
@@ -589,6 +583,12 @@
    </action>
   </release>
   <release version="2.1.8" date="TBD">
+    <action dev="RG" type="fix" fixes-bug="32784">
+      Portal Block: Allow Full screen mode to show navigation.
+    </action>
+     <action dev="RG" type="fix" fixes-bug="34802" due-to="Roy Huang" due-to-email="roy_huang@nbmgroup.com">
+      Portal Block: PageLabelLinkService generated the wrong url when using 3 layer tabs with showallnav.
+    </action>
     <action dev="VG" type="fix" fixes-bug="30894">
       Databases block: Support stored procedures returning result set in SQLTransformer.
     </action>