[Catalyst-commits] r10134 - Catalyst-Runtime/5.80/trunk

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-05-13 21:16:23 +0000 (Wed, 13 May 2009)
New Revision: 10134

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
   Catalyst-Runtime/5.80/trunk/TODO
Log:
2 down, too bloody many to go..

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-05-13 21:12:45 UTC (rev 10133)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-05-13 21:16:23 UTC (rev 10134)
@@ -106,6 +106,9 @@
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Plugin::Session' => '0.21',
+    'Catalyst::Plugin::Session::State::Cookie' => '0.10',
+    'Catalyst-Plugin-Session-Store-FastMmap' => '0.09',
     'Catalyst::Controller::AllowDisable' => '0.03',
     'Reaction' => '0.001999',
     'Catalyst::Plugin::Upload::Image::Magick' => '0.03',

Modified: Catalyst-Runtime/5.80/trunk/TODO
===================================================================
--- Catalyst-Runtime/5.80/trunk/TODO	2009-05-13 21:12:45 UTC (rev 10133)
+++ Catalyst-Runtime/5.80/trunk/TODO	2009-05-13 21:16:23 UTC (rev 10134)
@@ -6,8 +6,6 @@
      This is now fixed, by moving back to B::Hooks::EndOfScope, but this (used
      to) cause issues with the following modules:
 
-     - Catalyst-Plugin-Session-State-Cookie
-     - Catalyst-Plugin-Session-Store-FastMmap
      - Catalyst-Plugin-Session-PerUser
      - Catalyst-Plugin-Session-Store-File
      - Catalyst-Authentication-Credential-HTTP