2 down, too bloody many to go..

diff --git a/Makefile.PL b/Makefile.PL
index 315b77d..4017b18 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -106,6 +106,9 @@ EOF
 # 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',

diff --git a/TODO b/TODO
index 4a19400..cc83150 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,8 +6,6 @@ Pre 0004:
      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