diff options
author | John Keiser <john@johnkeiser.com> | 2016-08-16 10:45:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-16 10:45:11 -0700 |
commit | 23d27cf2807a9b5d4307818ed7e7501cf44db56e (patch) | |
tree | c348999099f4df598641523fa45df5642fd9cf31 | |
parent | 5134cdc5c4b855e088eedac28cc0567a9233e1e4 (diff) | |
parent | b98273185043f30f471b624c58252bfed16c0166 (diff) | |
download | chef-23d27cf2807a9b5d4307818ed7e7501cf44db56e.tar.gz |
Merge pull request #5208 from chef/jk/bump-minor
Bump minor version to 12.14
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 595e43a22e..7ff1afdf9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,9 +17,9 @@ GIT PATH remote: . specs: - chef (12.13.42) + chef (12.14.0) bundler (>= 1.10) - chef-config (= 12.13.42) + chef-config (= 12.14.0) chef-zero (~> 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -45,9 +45,9 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.13.42-universal-mingw32) + chef (12.14.0-universal-mingw32) bundler (>= 1.10) - chef-config (= 12.13.42) + chef-config (= 12.14.0) chef-zero (~> 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -88,7 +88,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.13.42) + chef-config (12.14.0) fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) @@ -1 +1 @@ -12.13.42
\ No newline at end of file +12.14.0 diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 06b757a7b8..f98448914d 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.13.42" + VERSION = "12.14.0" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 14d80891a8..2ec9107ee3 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.13.42" + VERSION = "12.14.0" end # |