fixed merge issues from master

diff --git a/Changes b/Changes
index 08bc0c5..1c8e5a0 100644 (file)
--- a/Changes
+++ b/Changes
@@ -15,11 +15,14 @@
     existing log and report other errors in the error stack.
 
 5.90069_001
+  - Set encoding on STDERR when encoding is set in config
+  - documentation and test fixes
+
+5.90065 - 2014-06-04
   - The Catalyst::Log object now has 'autoflush' (which defaults to true) and
     causes log messages to be written out in real-time. This is helpful for the
     test/dev server to be able to see messages during startup as well as before
     the end of the request when the log is flushed.
-  - Set encoding on STDERR when encoding is set in config
   - Fix spelling, grammar and structural errors in POD
   - Remove redundant ->setup call in t/head_middleware.t RT#95361
   - Fix test failures when running under CATALYST_DEBUG. RT#95358

diff --git a/lib/Catalyst/Delta.pod b/lib/Catalyst/Delta.pod
index 398649f..2d8c31d 100755 (executable)
--- a/lib/Catalyst/Delta.pod
+++ b/lib/Catalyst/Delta.pod
@@ -9,6 +9,15 @@ Catalyst releases.
 
 =head2 VERSION 5.90060+
 
+=head3 Catalyst::Log object autoflush on by default
+
+Starting in 5.90065, the Catalyst::Log object has 'autoflush' which is on
+by default. This causes all messages to be written to the log immediately
+instead of at the end of startup and then at the end of each request. In
+order to access the old behavior, you must now call:
+
+  $c->log->autoflush(0);
+
 =head3 Deprecate Catalyst::Utils::ensure_class_loaded
 
 Going forward we recommend you use L<Module::Runtime>.  In fact we will