From: John Napiorkowski <jjnapiork@cpan.org>
Date: Tue, 10 Jun 2014 00:16:58 +0000 (-0400)
Subject: up version prep for release
X-Git-Tag: 5.90070~19
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=00eba41560d2ae20621631e9dab82dba4e760d55

up version prep for release
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8ad1b7d..f6b1d09 100755
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -54,7 +54,6 @@ use Class::Load 'load_class';
 BEGIN { require 5.008003; }
 
 has stack => (is => 'ro', default => sub { [] });
-#has stash => (is => 'rw', default => sub { {} });
 has state => (is => 'rw', default => 0);
 has stats => (is => 'rw');
 has action => (is => 'rw');
@@ -127,7 +126,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.90069_001';
+our $VERSION = '5.90069_002';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -495,23 +494,6 @@ Catalyst).
     # stash is automatically passed to the view for use in a template
     $c->forward( 'MyApp::View::TT' );
 
-
-
-around stash => sub {
-    my $orig = shift;
-    my $c = shift;
-    my $stash = $orig->($c);
-    if (@_) {
-        my $new_stash = @_ > 1 ? {@_} : $_[0];
-        croak('stash takes a hash or hashref') unless ref $new_stash;
-        foreach my $key ( keys %$new_stash ) {
-          $stash->{$key} = $new_stash->{$key};
-        }
-    }
-
-    return $stash;
-};
-
 =cut
 
 sub stash {
diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm
index 7559573..0d8d4c5 100644
--- a/lib/Catalyst/Runtime.pm
+++ b/lib/Catalyst/Runtime.pm
@@ -7,7 +7,7 @@ BEGIN { require 5.008003; }
 
 # Remember to update this in Catalyst as well!
 
-our $VERSION = '5.90069_001';
+our $VERSION = '5.90069_002';
 
 =head1 NAME