Update changelog

phlipper · Mar 9, 2012 · 6a8887f · 6a8887f
1 parent 48afe24
commit 6a8887f
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,14 @@
+2.6.2 (March 9, 2012)
+  Allow factories to use all their ancestors' traits
+  Ignore bin dir generated by bundler
+  Namespace ::Factory as top-level to fix vintage syntax issue with
+    Ruby 1.9.2-p3p18
+
+2.6.1 (March 2, 2012)
+  Use FactoryGirl.reload in specs
+  Clean up running named factories with a particular strategy with
+    FactoryGirl::FactoryRunner
+
 2.6.0 (February 17, 2012)
   Improve documentation of has_many associations in the GETTING_STARTED
     document