Merging Branches

This page helps keeping track of merging back the changes already done in the 2.2-dev repository (trunk) to the 2.1.x branch.

URGENT

There are some changes which claimed to be in 2.1 and actually not in 2.1, and changes which are in 2.1 but not in 2.2. Please review the list and help to reconcile discrpancies before a release: (The original mail by Vadim)

--- cocoon-2.1.X\status.xml     2004-11-11 12:13:14.849524800 -0500
+++ cocoon-2.2.X\status.xml     2004-11-11 12:12:47.129665600 -0500
@@ -260,6 +414,9 @@
      Flow invocations (function calls or continuation invocations) should always
      result in a response. Flowscripts with no response are prohibited.
    </action>
+   <action dev="CZ" type="add" due-to="Sascha-Matthias Kulawik" due-to-email="sascha@kulawik.de">
+     Authentication block: Add authenticator for JAAS.
+   </action>
    <action dev="CZ" type="add" due-to="Juergen Seitz" due-to-email="Juergen.Seitz@Basf-It-Services.Com">
      Portal block: Apply batch for configuring the type handling in the Castor converter.
    </action>

Not Merged

Blocks:

Already Merged

Blocks:

MergingBranches (last edited 2009-09-20 23:42:52 by localhost)