From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 13 May 2009 21:16:23 +0000 (+0000)
Subject: 2 down, too bloody many to go..
X-Git-Tag: 5.80004~17
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=1d9dd18007b36d6c0cd19fa2b7be72840dd0cda1

2 down, too bloody many to go..
---

diff --git a/Makefile.PL b/Makefile.PL
index 315b77d..4017b18 100644
--- 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
--- 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