summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-06-09 10:35:24 -0700
committerMatt Wrock <matt@mattwrock.com>2016-06-09 10:35:24 -0700
commit0934798c307560ae5e557b2d35cd224bbafa4510 (patch)
treef103fd46cc82e5de9e618e69ae95c055ed905ce9
parent4a976f3e5bd4827eab7ab42eeb110da5fd82796b (diff)
parente7dc618c5c963931f6a69f8e9e7712d6bbcfd1c8 (diff)
downloadchef-0934798c307560ae5e557b2d35cd224bbafa4510.tar.gz
Merge pull request #5012 from chef/12_12
updating chef minor version
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
4 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 26ab929341..18d4aacefb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,9 +18,9 @@ GIT
PATH
remote: .
specs:
- chef (12.11.27)
+ chef (12.12.0)
bundler (>= 1.10)
- chef-config (= 12.11.27)
+ chef-config (= 12.12.0)
chef-zero (~> 4.5)
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.11.27-universal-mingw32)
+ chef (12.12.0-universal-mingw32)
bundler (>= 1.10)
- chef-config (= 12.11.27)
+ chef-config (= 12.12.0)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -87,7 +87,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.11.27)
+ chef-config (12.12.0)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
diff --git a/VERSION b/VERSION
index 9711933199..1fc48883b5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.11.27 \ No newline at end of file
+12.12.0 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 68b88b4872..f3778d3357 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.11.27"
+ VERSION = "12.12.0"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index bee49dae6c..96ff052ae4 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.11.27"
+ VERSION = "12.12.0"
end
#