summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-09-27 20:12:34 -0700
committerGitHub <noreply@github.com>2016-09-27 20:12:34 -0700
commit992487ad24010c6a0c68311234ded1c2cfb951cc (patch)
tree804828aa2bb417cefa5cc615321e313aa692c22b
parent5fd460b94cfc5f4e7ac6cf5ccdae1a256d6aadd9 (diff)
downloadchef-992487ad24010c6a0c68311234ded1c2cfb951cc.tar.gz
bumping chef minor version (#5390)
-rw-r--r--Gemfile.lock24
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
4 files changed, 15 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c74e1aaaeb..ea1e8c1466 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: dc72f9de64d27c81d74303c2c62ace1094f4846b
+ revision: aa7b99ac81ff4c018a0081e9a273b87b15342f12
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -33,10 +33,10 @@ GIT
PATH
remote: .
specs:
- chef (12.14.99)
+ chef (12.15.0)
addressable
bundler (>= 1.10)
- chef-config (= 12.14.99)
+ chef-config (= 12.15.0)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -62,10 +62,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.14.99-universal-mingw32)
+ chef (12.15.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.14.99)
+ chef-config (= 12.15.0)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -106,7 +106,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.14.99)
+ chef-config (12.15.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -125,12 +125,12 @@ GEM
mixlib-cli (~> 1.4)
artifactory (2.5.0)
ast (2.3.0)
- aws-sdk (2.6.3)
- aws-sdk-resources (= 2.6.3)
- aws-sdk-core (2.6.3)
+ aws-sdk (2.6.4)
+ aws-sdk-resources (= 2.6.4)
+ aws-sdk-core (2.6.4)
jmespath (~> 1.0)
- aws-sdk-resources (2.6.3)
- aws-sdk-core (= 2.6.3)
+ aws-sdk-resources (2.6.4)
+ aws-sdk-core (= 2.6.4)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
@@ -201,7 +201,7 @@ GEM
erubis (2.7.0)
ethon (0.9.1)
ffi (>= 1.3.0)
- excon (0.52.0)
+ excon (0.53.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
diff --git a/VERSION b/VERSION
index f310f414ab..f9a588fad1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.14.99 \ No newline at end of file
+12.15.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 fec984f0dc..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.99"
+ VERSION = "12.15.0"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 85131b2308..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.99"
+ VERSION = "12.15.0"
end
#