Updating CHANGELOG for the 1.1.2

merb · Jun 17, 2010 · 91828da · 91828da
1 parent e42b8bb
commit 91828da
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+== Merb 1.1.2 "Dependency hell" 2010-06-17
+
+* [merb-core] Gracefully fail when RSpec is not installed but used.
+* [merb-core] Because 1.1.x still use the Bundler we have to depend on it.
+* [merb] Require independent versions of the merb-auth and merb_datamapper.
+
+
 == Merb 1.1.1 "In between the notes" 2010-06-14
 
 * Spec fixes to get more green and 1.8.x compat