Ship version 1.1.0

* Add testing for newer Ruby 2.2, 2.3, head, and jruby-head. * Add extend_existing_arrays option * Add overwrite_arrays option * Remove support for old Ruby 1.8 and 1.9
danielsdeleo · Aug 1, 2016 · 97f2f22 · 97f2f22
1 parent c56e162
commit 97f2f22
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,20 @@
+2016-08-01 Jason Frey <fryguy9@gmail.com>
+  * Ship version 1.1.0
+
+  * Add testing for newer Ruby 2.2, 2.3, head, and jruby-head.
+
+2016-06-14 Michael Sievers <michael_sievers@web.de>
+  * Add extend_existing_arrays option
+
+2016-06-07 Jason Frey <fryguy9@gmail.com>
+  * Add overwrite_arrays option
+
+2016-04-08 Dan Deleo <dan@kallistec.com>
+  * Remove support for old Ruby 1.8 and 1.9
+
 2014-01-21 Dan DeLeo <dan@kallistec.com>
+  * Ship version 1.0.1
+
   * Update knockout behavior to better handle nil (b7de40b5)
 
 2011-08-15 Dan DeLeo <dan@kallistec.com>

diff --git a/deep_merge.gemspec b/deep_merge.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deep_merge}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.authors = ["Steve Midgley"]
   s.date = %q{2011-07-28}