From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 15 Oct 2010 23:02:50 +0000 (-0500)
Subject: changelog and conflict
X-Git-Tag: 1.16~49
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=259b8c5ae15c2e4f5e48e79773e72869f5b9ff34;hp=0cfc2850140b8e2bf37ccbb3ae3e0053e69113ab;p=gitmo%2FMoose.git

changelog and conflict
---

diff --git a/Changes b/Changes
index a0989b2..edc28f1 100644
--- a/Changes
+++ b/Changes
@@ -16,6 +16,11 @@ NEXT
   * Roles now support passing an array reference of method names to method
     modifier sugar functions. (doy)
 
+  * Native traits now don't use optimized inlining routines if the instance
+    requests it (in particular, if inline_get_slot_value doesn't return
+    something that can be assigned to). This should fix issues with
+    KiokuDB::Class. (doy)
+
 1.15 Tue, Oct 5, 2010
 
   [API CHANGES]
diff --git a/Makefile.PL b/Makefile.PL
index 75f0ade..a4b6f75 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -74,7 +74,7 @@ sub check_conflicts {
         'Fey'                            => '0.36',
         'Fey::ORM'                       => '0.34',
         'File::ChangeNotify'             => '0.15',
-        'KiokuDB'                        => '0.41',
+        'KiokuDB'                        => '0.49',
         'Markdent'                       => '0.16',
         'MooseX::Aliases'                => '0.07',
         'MooseX::AlwaysCoerce'           => '0.05',