summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2016-05-12 21:56:37 +0000
committerChef Versioner <chef-versioner@chef.io>2016-05-12 21:56:37 +0000
commit4b9d5f70ba46eeb0445de1d0fbb11d05d2614cca (patch)
treeee8d552ed4113858784295446c0174281ac7d5a8
parentdb9e11a6d64db304b04850bf6ff0ce3d782f5482 (diff)
downloadchef-4b9d5f70ba46eeb0445de1d0fbb11d05d2614cca.tar.gz
Bump version of chef to 12.10.47 by Chef Versioner.v12.10.47
-rw-r--r--Gemfile.lock20
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock22
5 files changed, 20 insertions, 28 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a42edb5279..5f5ab4bf85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,9 +18,9 @@ GIT
PATH
remote: .
specs:
- chef (12.10.46)
+ chef (12.10.47)
bundler (>= 1.10)
- chef-config (= 12.10.46)
+ chef-config (= 12.10.47)
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.10.46-universal-mingw32)
+ chef (12.10.47-universal-mingw32)
bundler (>= 1.10)
- chef-config (= 12.10.46)
+ chef-config (= 12.10.47)
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.10.46)
+ chef-config (12.10.47)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -100,12 +100,12 @@ GEM
mixlib-cli (~> 1.4)
artifactory (2.3.2)
ast (2.2.0)
- aws-sdk (2.3.3)
- aws-sdk-resources (= 2.3.3)
- aws-sdk-core (2.3.3)
+ aws-sdk (2.3.4)
+ aws-sdk-resources (= 2.3.4)
+ aws-sdk-core (2.3.4)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.3)
- aws-sdk-core (= 2.3.3)
+ aws-sdk-resources (2.3.4)
+ aws-sdk-core (= 2.3.4)
aws-sdk-v1 (1.66.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
diff --git a/VERSION b/VERSION
index 7b3d4c0160..2ddea2be0d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.10.46 \ No newline at end of file
+12.10.47 \ 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 f740a74f88..69f0e11d00 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.10.46"
+ VERSION = "12.10.47"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 68997a1832..7a7de2f06c 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.10.46"
+ VERSION = "12.10.47"
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 879e8ecf4f..ad746a4fcd 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 7e566482a86aca8b94e77285242b6a526fe77ffe
+ revision: 91797cdae99ca91cb87af877ceb4953610d45152
specs:
omnibus-software (4.0.0)
omnibus (>= 5.2.0)
@@ -38,12 +38,12 @@ GEM
addressable (2.3.8)
artifactory (2.3.2)
awesome_print (1.6.1)
- aws-sdk (2.3.2)
- aws-sdk-resources (= 2.3.2)
- aws-sdk-core (2.3.2)
+ aws-sdk (2.3.4)
+ aws-sdk-resources (= 2.3.4)
+ aws-sdk-core (2.3.4)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.2)
- aws-sdk-core (= 2.3.2)
+ aws-sdk-resources (2.3.4)
+ aws-sdk-core (= 2.3.4)
berkshelf (3.3.0)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
@@ -98,7 +98,6 @@ GEM
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
- ffi (1.9.10-x86-mingw32)
ffi-yajl (2.2.3)
libyajl2 (~> 1.2)
fuzzyurl (0.8.0)
@@ -108,7 +107,6 @@ GEM
builder (>= 2.1.2)
hashie (3.4.4)
hitimes (1.2.4)
- hitimes (1.2.4-x86-mingw32)
httpclient (2.6.0.1)
iostruct (0.0.4)
ipaddress (0.8.3)
@@ -138,9 +136,6 @@ GEM
mixlib-versioning
mixlib-log (1.6.0)
mixlib-shellout (2.2.6)
- mixlib-shellout (2.2.6-universal-mingw32)
- win32-process (~> 0.8.2)
- wmi-lite (~> 1.0)
mixlib-versioning (1.1.0)
multi_json (1.12.0)
multipart-post (1.2.0)
@@ -151,7 +146,7 @@ GEM
nori (2.6.0)
octokit (3.8.0)
sawyer (~> 0.6.0, >= 0.5.3)
- ohai (8.15.1)
+ ohai (8.16.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -229,8 +224,6 @@ GEM
varia_model (0.4.1)
buff-extensions (~> 1.0)
hashie (>= 2.0.2, < 4.0.0)
- win32-process (0.8.3)
- ffi (>= 1.0.0)
winrm (1.8.1)
builder (>= 2.1.2)
gssapi (~> 1.2)
@@ -249,7 +242,6 @@ GEM
PLATFORMS
ruby
- x86-mingw32
DEPENDENCIES
berkshelf (~> 3.0)