Merge branch 'release/1.3.0' into develop

markround · Apr 10, 2018 · fc1e9aa · fc1e9aa
2 parents f76b2f8 + bfb3b3a
commit fc1e9aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,4 +1,8 @@
 # 1.x
+  * 1.3.0 (10/Apr/2018)
+    * Miscellaneous bug fixes and some preparation work for future 2.0 releases
+    * Fixed [Issue #65](https://github.com/markround/tiller/issues/65), again thanks to [Pablo Gonzalez](https://github.com/kydorn) for reporting the issue and providing the PR to fix the issue.
+
   * 1.2.0 (09/Jun/2017)
     * Sort defaults files before loading. Thanks to [Pablo Gonzalez](https://github.com/kydorn) for [PR #57](https://github.com/markround/tiller/pull/57)
     * Allow dynamic_values in top-level config [Issue #58](https://github.com/markround/tiller/issues/58). Thanks to [Andrew Kroenert](https://github.com/andrewkro) for the feature request.

diff --git a/lib/tiller/version.rb b/lib/tiller/version.rb
@@ -1,3 +1,3 @@
 # http://semver.org/
-VERSION="1.2.0"
+VERSION="1.3.0"
 SUPPORTED_RUBY_VERSION="2.2.0"
diff --git a/tiller.gemspec b/tiller.gemspec
@@ -3,7 +3,7 @@ require './lib/tiller/version.rb'
 Gem::Specification.new do |s|
   s.name = 'tiller'
   s.version = VERSION
-  s.date = '2017-06-09'
+  s.date = '2018-04-10'
   s.summary = 'Dynamic configuration file generation'
   s.description = 'A tool to create configuration files from a variety of sources, particularly useful for Docker containers. See https://github.com/markround/tiller for examples and documentation.'
   s.authors = ['Mark Dastmalchi-Round']