summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-02-02 13:50:46 +0000
committerThom May <thom@chef.io>2017-02-02 16:18:28 +0000
commitbd66a33f3c2d4072c6122ac38e26c14f816ac581 (patch)
treea78cf724f80e575e51293bfc8f8f6e99080b8e24
parent301c9ee3e7f027809250e09d9598a8b7c5cbe899 (diff)
downloadchef-tm/bump_m_a.tar.gz
Bump mixlib-archive version to 0.4tm/bump_m_a
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--.bundle/config2
-rw-r--r--Gemfile.lock58
-rw-r--r--chef.gemspec2
3 files changed, 31 insertions, 31 deletions
diff --git a/.bundle/config b/.bundle/config
index 7544be9dd7..e520135ebc 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,2 +1,2 @@
---
-BUNDLE_FROZEN: '1'
+BUNDLE_FROZEN: "1"
diff --git a/Gemfile.lock b/Gemfile.lock
index b8b9616482..dc81e8a45b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 96c04f9941f96c8be993b7103a0deb221f054120
+ revision: 815b5accf880bb7b7bacb3f1721cb2fbd250a173
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -16,7 +16,7 @@ GIT
GIT
remote: https://github.com/chef/chefstyle.git
- revision: f3bc51612667e069f736f8ff18cf0bc0c18098fb
+ revision: ba0cfca677c8dc66de471cbd3da37d000a93dce0
branch: master
specs:
chefstyle (0.4.0)
@@ -24,7 +24,7 @@ GIT
GIT
remote: https://github.com/rubysec/bundler-audit.git
- revision: 80ae638e72df4c218da0e7a485ea2ee73aa257f2
+ revision: 6eb5a81e9b184fbb8db03f3e57dc758c65dd7383
specs:
bundler-audit (0.5.0)
bundler (~> 1.2)
@@ -32,7 +32,7 @@ GIT
GIT
remote: https://github.com/tduffield/github-changelog-generator
- revision: 8effcdd6988617b453669965fedc1280aa84bd7a
+ revision: c6245b58b91b863464ca88e02aa752a0658b5f30
branch: adjust-tag-section-mapping
specs:
github_changelog_generator (1.14.2)
@@ -57,7 +57,7 @@ PATH
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- mixlib-archive (>= 0.2.0)
+ mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
mixlib-log (~> 1.3)
@@ -87,7 +87,7 @@ PATH
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- mixlib-archive (>= 0.2.0)
+ mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
mixlib-log (~> 1.3)
@@ -137,15 +137,15 @@ GEM
addressable (2.4.0)
appbundler (0.10.0)
mixlib-cli (~> 1.4)
- artifactory (2.5.1)
+ artifactory (2.6.0)
ast (2.3.0)
- aws-sdk (2.7.0)
- aws-sdk-resources (= 2.7.0)
- aws-sdk-core (2.7.0)
+ aws-sdk (2.7.3)
+ aws-sdk-resources (= 2.7.3)
+ aws-sdk-core (2.7.3)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.7.0)
- aws-sdk-core (= 2.7.0)
+ aws-sdk-resources (2.7.3)
+ aws-sdk-core (= 2.7.3)
aws-sigv4 (1.0.0)
backports (3.6.8)
binding_of_caller (0.7.2)
@@ -244,17 +244,17 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- halite (1.3.0)
+ halite (1.4.0)
bundler
chef (~> 12.0)
stove (~> 4.0)
thor
- hashie (3.4.6)
+ hashie (3.5.1)
highline (1.7.8)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
- i18n (0.7.0)
+ i18n (0.8.0)
inifile (3.0.0)
iniparse (1.4.2)
ipaddress (0.8.3)
@@ -273,7 +273,7 @@ GEM
test-kitchen (>= 1.0.0)
kitchen-vagrant (1.0.0)
test-kitchen (~> 1.4)
- knife-windows (1.8.0)
+ knife-windows (1.9.0)
winrm (~> 2.1)
winrm-elevated (~> 1.0)
launchy (2.4.3)
@@ -290,13 +290,13 @@ GEM
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
- mixlib-archive (0.3.0)
+ mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
- mixlib-install (2.1.10)
+ mixlib-install (2.1.11)
artifactory
mixlib-shellout
mixlib-versioning
@@ -318,7 +318,7 @@ GEM
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.0.1)
- net-ssh-gateway (1.2.0)
+ net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
@@ -332,7 +332,7 @@ GEM
nori (2.6.0)
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (8.22.1)
+ ohai (8.23.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -347,9 +347,9 @@ GEM
parser (2.3.3.1)
ast (~> 2.2)
plist (3.2.0)
- poise (2.7.1)
+ poise (2.7.2)
halite (~> 1.0)
- poise-boiler (1.13.1)
+ poise-boiler (1.13.2)
bundler
chefspec (~> 5.0)
codeclimate-test-reporter (~> 0.4)
@@ -373,8 +373,8 @@ GEM
test-kitchen (~> 1.7, >= 1.7.1)
travis (~> 1.8, >= 1.8.1)
vagrant-wrapper
- winrm (~> 2.0)
- winrm-fs (~> 1.0)
+ winrm (>= 1.6, < 3)
+ winrm-fs (>= 0.4, < 2)
yard (~> 0.8)
yard-classmethods (~> 1.0)
poise-profiler (1.0.1)
@@ -456,13 +456,13 @@ GEM
rspec-its
specinfra (~> 2.53)
sfl (2.3)
- simplecov (0.12.0)
+ simplecov (0.13.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.66.5)
+ specinfra (2.66.7)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
@@ -483,7 +483,7 @@ GEM
thor (0.19.4)
thread_safe (0.3.5)
tomlrb (1.2.3)
- travis (1.8.5)
+ travis (1.8.6)
backports
faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1)
@@ -506,7 +506,7 @@ GEM
url (0.3.2)
uuidtools (2.1.5)
vagrant-wrapper (2.0.3)
- websocket (1.2.3)
+ websocket (1.2.4)
win32-api (1.5.3-universal-mingw32)
win32-dir (0.5.1)
ffi (>= 1.0.0)
@@ -591,4 +591,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.12.5
+ 1.13.7
diff --git a/chef.gemspec b/chef.gemspec
index 2d5544aa4f..dd2d7d3bf2 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.add_dependency "mixlib-log", "~> 1.3"
s.add_dependency "mixlib-authentication", "~> 1.4"
s.add_dependency "mixlib-shellout", "~> 2.0"
- s.add_dependency "mixlib-archive", ">= 0.2.0"
+ s.add_dependency "mixlib-archive", "~> 0.4"
s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 9"
s.add_dependency "ffi-yajl", "~> 2.2"