From: John Napiorkowski <jjnapiork@cpan.org>
Date: Fri, 20 Sep 2013 18:19:26 +0000 (-0400)
Subject: merged conflicts
X-Git-Tag: 5.90050~1^2~42
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=35b3434762d426e0cd5e04eb735291f8ca7ea08e

merged conflicts
---

35b3434762d426e0cd5e04eb735291f8ca7ea08e
diff --cc MANIFEST.SKIP
index 1b7456f,876969a..b9ad8e0
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@@ -1,1 -1,2 +1,2 @@@
 -^(?!script/\w+\.pl$|TODO$|lib/.+(?<!ROADMAP)\.p(m|od)$|inc/|t/a(uthor|ggregate)/.*\.t$|t/([^/]+|.{1,2}|[^t][^m][^p].*)\.(gif|yml|pl|t)$|t/lib/.*\.pm$|t/something/(Makefile.PL|script/foo/bar/for_dist)$|t/conf/extra.conf.in$|Makefile.PL$|README$|MANIFEST$|Changes$|META.yml$)
 +^(?!script/\w+\.pl$|TODO$|lib/.+(?<!ROADMAP)\.p(m|od)$|inc/|t/a(uthor|ggregate)/.*\.t$|t/([^/]+|.{1,2}|[^t][^m][^p].*)\.(gif|yml|pl|t)$|t/lib/.*\.pm$|t/something/(Makefile.PL|script/foo/bar/for_dist)$|t/conf/extra.conf.in$|Makefile.PL$|README$|MANIFEST$|Changes$|META.yml$|.+testappencodingsetinconfig.json|.+TestMiddleware/share.*)
+ /cpanfile
diff --cc Makefile.PL
index e561124,7ff59dc..79b8380
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -71,20 -70,21 +70,23 @@@ requires 'Class::Data::Inheritable'
  requires 'Encode' => '2.49';
  requires 'LWP' => '5.837'; # LWP had unicode fail in 5.8.26
  requires 'URI' => '1.36';
 +requires 'JSON::MaybeXS' => '1.000000',
  
  # Install the standalone Regex dispatch modules in order to ease the
- # depreciation transition
+ # deprecation transition
  requires 'Catalyst::DispatchType::Regex' => '5.90021';
  
- test_requires 'Test::Exception';
+ test_requires 'Test::Fatal';
  test_requires 'Test::More' => '0.88';
  test_requires 'Data::Dump';
  test_requires 'HTTP::Request::Common';
  test_requires 'IO::Scalar';
  test_requires 'HTTP::Status';
 +test_requires 'JSON::MaybeXS';
  
+ # see also cpanfile for authordeps -- install via
+ # cpanm --installdeps --with-develop .
+ 
  # aggregate tests if AGGREGATE_TESTS is set and a recent Test::Aggregate and a Test::Simple it works with is available
  my @author_requires;
  if ($ENV{AGGREGATE_TESTS} && can_use('Test::Simple', '0.88') && can_use('Test::Aggregate', '0.364')) {
diff --cc lib/Catalyst.pm
index 8fc94d6,1c7d830..0e2fdbd
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@@ -40,8 -41,7 +41,8 @@@ use Plack::Middleware::ReverseProxy
  use Plack::Middleware::IIS6ScriptNameFix;
  use Plack::Middleware::IIS7KeepAliveFix;
  use Plack::Middleware::LighttpdScriptNameFix;
 +use Plack::Util;
- use Class::Load;
+ use Class::Load 'load_class';
  
  BEGIN { require 5.008003; }
  
diff --cc lib/Catalyst/Utils.pm
index e6a8801,56c2a80..31773b7
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@@ -7,9 -7,8 +7,9 @@@ use Path::Class
  use URI;
  use Carp qw/croak/;
  use Cwd;
- use Class::MOP;
+ use Class::Load 'is_class_loaded';
  use String::RewritePrefix;
 +use Class::Load ();
  
  use namespace::clean;