summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hass <rhass@chef.io>2016-09-21 12:36:02 -0700
committerRyan Hass <rhass@chef.io>2016-09-21 12:36:02 -0700
commit908c2cdd92e08d742e730921bc7ddea725c1bf24 (patch)
treecbacf5f744252ebe5a852186053364fb4f6fee93
parent9965f280523f0cf467906615dc90d416a3621a57 (diff)
downloadchef-rhass/12.15.0.tar.gz
Bump minor version to 12.15.0rhass/12.15.0
Signed-off-by: Ryan Hass <rhass@chef.io>
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
4 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1f70e03af9..403006e82d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 608dbe94d15822a31849952e13549744fc40a702
+ revision: ba0ec88f6800215c574d1d41c4b8bcc86d6f25b0
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -66,10 +66,10 @@ GIT
PATH
remote: .
specs:
- chef (12.14.86)
+ chef (12.15.0)
addressable
bundler (>= 1.10)
- chef-config (= 12.14.86)
+ chef-config (= 12.15.0)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -95,10 +95,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.14.86-universal-mingw32)
+ chef (12.15.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.14.86)
+ chef-config (= 12.15.0)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -139,7 +139,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.14.86)
+ chef-config (12.15.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -480,7 +480,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.63.0)
+ specinfra (2.63.1)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
diff --git a/VERSION b/VERSION
index ec21b3d5b6..49d70ce461 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.14.86 \ No newline at end of file
+12.15.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c79b9d44a4..a9f4326297 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.14.86"
+ VERSION = "12.15.0"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1dd65a5e94..5062c6239e 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.14.86"
+ VERSION = "12.15.0"
end
#