CHANGELOG.md in berkshelf-5.6.5 vs CHANGELOG.md in berkshelf-6.0.0

- old
+ new

@@ -1,19 +1,27 @@ # Change Log -## [5.6.5](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-05-04) -[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.4...5.6.5) +## [6.0.0](https://github.com/berkshelf/berkshelf/tree/6.0.0) (2017-05-17) +[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.5...6.0.0) **Merged pull requests:** -- Handle Windows backslashes in trusted_certs path [\#1689](https://github.com/berkshelf/berkshelf/pull/1689) ([jeremymv2](https://github.com/jeremymv2)) +- Minor refactor on the default artifactory options and support artifactory\_api\_key in knife.rb [\#1691](https://github.com/berkshelf/berkshelf/pull/1691) ([coderanger](https://github.com/coderanger)) +- Artifactory support [\#1690](https://github.com/berkshelf/berkshelf/pull/1690) ([coderanger](https://github.com/coderanger)) -## [5.6.4](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-03-14) -[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.3...5.6.4) +## [v5.6.5](https://github.com/berkshelf/berkshelf/tree/v5.6.5) (2017-05-04) +[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.4...v5.6.5) **Merged pull requests:** +- handle Windows backslashes in trusted\_certs path [\#1689](https://github.com/berkshelf/berkshelf/pull/1689) ([jeremymv2](https://github.com/jeremymv2)) + +## [v5.6.4](https://github.com/berkshelf/berkshelf/tree/v5.6.4) (2017-03-14) +[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.3...v5.6.4) + +**Merged pull requests:** + - Add Support for Auth Proxy [\#1684](https://github.com/berkshelf/berkshelf/pull/1684) ([tduffield](https://github.com/tduffield)) ## [v5.6.3](https://github.com/berkshelf/berkshelf/tree/v5.6.3) (2017-02-23) [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.2...v5.6.3) @@ -1424,6 +1432,6 @@ - Rake checks [\#2](https://github.com/berkshelf/berkshelf/pull/2) ([erikh](https://github.com/erikh)) - gemfile and building gem properly. Version is in lib/remy/version.rb [\#1](https://github.com/berkshelf/berkshelf/pull/1) ([erikh](https://github.com/erikh)) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file