summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-10-05 18:55:18 -0700
committerMatt Wrock <matt@mattwrock.com>2016-10-05 18:55:18 -0700
commit7856259fa75ddb209653a499adb789e98dd220fa (patch)
treea4a2c3f24e7e54af1a8118c3fe6f743ad41545e7
parenta18fc54e4c151760a2979e52cd4a93f3be3bc151 (diff)
downloadchef-7856259fa75ddb209653a499adb789e98dd220fa.tar.gz
bump version
-rw-r--r--Gemfile.lock25
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
4 files changed, 14 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index abf661dd4e..d9874b64a7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 6fde9680c6efdcd0792bec840b7fe7f6fbee790f
+ revision: f590895120288ad895e5794595da4ef5f81ed4f5
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -33,10 +33,10 @@ GIT
PATH
remote: .
specs:
- chef (12.15.12)
+ chef (12.15.13)
addressable
bundler (>= 1.10)
- chef-config (= 12.15.12)
+ chef-config (= 12.15.13)
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.15.12-universal-mingw32)
+ chef (12.15.13-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.15.12)
+ chef-config (= 12.15.13)
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.15.12)
+ chef-config (12.15.13)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -300,7 +300,7 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.0.3)
+ mixlib-install (2.1.0)
artifactory
mixlib-shellout
mixlib-versioning
@@ -329,12 +329,10 @@ GEM
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
netrc (0.11.0)
- nokogiri (1.6.8)
+ nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
- nokogiri (1.6.8-x86-mingw32)
+ nokogiri (1.6.8.1-x86-mingw32)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
nori (2.6.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
@@ -358,7 +356,6 @@ GEM
wmi-lite (~> 1.0)
parser (2.3.1.4)
ast (~> 2.2)
- pkg-config (1.1.7)
plist (3.2.0)
poise (2.7.1)
halite (~> 1.0)
@@ -467,14 +464,14 @@ GEM
rspec (~> 3.0)
rspec-its
specinfra (~> 2.53)
- sfl (2.2)
+ sfl (2.3)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.63.1)
+ specinfra (2.63.2)
net-scp
net-ssh (>= 2.7, < 4.0)
net-telnet
diff --git a/VERSION b/VERSION
index 05b162930b..a0327e0ca3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.15.12 \ No newline at end of file
+12.15.13 \ 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 dd34193cae..4370e1a065 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.15.12"
+ VERSION = "12.15.13"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6ea6916109..43461b2ff4 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.15.12"
+ VERSION = "12.15.13"
end
#