Skip to content

Commit

Permalink
Merge pull request #333 from chef/incompat
Browse files Browse the repository at this point in the history
Bumps winrm-s and winrm dependencies to address a winrm-s incompatibi…
  • Loading branch information
mwrock committed Jan 15, 2016
2 parents 0269ec9 + 6c3c431 commit ec53122
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# knife-windows Change Log

## Release 1.1.4
* Bumps winrm-s and winrm dependencies to address a winrm-s incompatibility bug with winrm 1.5

## Release 1.1.3
* [knife-windows #329](https://github.com/chef/knife-windows/pull/329) Pin to a minimum winrm-s of 0.3.2 addressing encoding issues in 0.3.1

Expand Down
5 changes: 2 additions & 3 deletions knife-windows.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Gem::Specification.new do |s|
s.description = s.summary

s.required_ruby_version = ">= 1.9.1"
s.add_dependency "winrm", "~> 1.3"
s.add_dependency "winrm-s", "~> 0.3.2"
s.add_dependency "winrm", "~> 1.5"
s.add_dependency "winrm-s", "~> 0.3.4"
s.add_dependency "nokogiri"

s.add_development_dependency 'pry'
Expand All @@ -25,4 +25,3 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]
end

2 changes: 1 addition & 1 deletion lib/knife-windows/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Knife
module Windows
VERSION = "1.1.3"
VERSION = "1.1.4"
MAJOR, MINOR, TINY = VERSION.split('.')
end
end

0 comments on commit ec53122

Please sign in to comment.