Merge pull request #52 from chef/0.12.0

0.12.0
inspec · Feb 19, 2016 · 7a520f3 · 7a520f3
2 parents 5c626a1 + 05879de
commit 7a520f3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,32 @@
 # Change Log
 
-## [0.11.1](https://github.com/chef/kitchen-inspec/tree/0.11.1) (2016-02-15)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.11.0...0.11.1)
+## [0.12.0](https://github.com/chef/kitchen-inspec/tree/0.12.0) (2016-02-19)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.11.1...0.12.0)
+
+**Implemented enhancements:**
+
+- move integration tests to top-level [\#50](https://github.com/chef/kitchen-inspec/pull/50) ([chris-rock](https://github.com/chris-rock))
+- support embedded profiles, leave directory checking to inspec [\#49](https://github.com/chef/kitchen-inspec/pull/49) ([chris-rock](https://github.com/chris-rock))
+
+**Fixed bugs:**
+
+- Point test-kitchen to master in Gemfile [\#48](https://github.com/chef/kitchen-inspec/pull/48) ([jaym](https://github.com/jaym))
+
+## [v0.11.1](https://github.com/chef/kitchen-inspec/tree/v0.11.1) (2016-02-15)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.11.0...v0.11.1)
+
+**Implemented enhancements:**
+
+- work well with other testing frameworks in test-kitchen [\#40](https://github.com/chef/kitchen-inspec/pull/40) ([chris-rock](https://github.com/chris-rock))
 
 **Fixed bugs:**
 
 - bugfix: use the right container in combination with kitchen-dokken [\#43](https://github.com/chef/kitchen-inspec/pull/43) ([chris-rock](https://github.com/chris-rock))
 
 **Merged pull requests:**
 
+- 0.11.1 [\#47](https://github.com/chef/kitchen-inspec/pull/47) ([chris-rock](https://github.com/chris-rock))
 - deduplicate Gemfiles [\#41](https://github.com/chef/kitchen-inspec/pull/41) ([srenatus](https://github.com/srenatus))
-- work well with other testing frameworks in test-kitchen [\#40](https://github.com/chef/kitchen-inspec/pull/40) ([chris-rock](https://github.com/chris-rock))
 
 ## [v0.11.0](https://github.com/chef/kitchen-inspec/tree/v0.11.0) (2016-02-08)
 [Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.10.1...v0.11.0)

diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,6 @@ group :test do
   gem 'rubocop', '~> 0.32'
   gem 'concurrent-ruby', '~> 0.9'
   gem 'codeclimate-test-reporter', :require => nil
-  # gem 'test-kitchen', '~> 1.5'
   gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen.git', branch: 'master'
 end
 

diff --git a/lib/kitchen/verifier/inspec_version.rb b/lib/kitchen/verifier/inspec_version.rb
@@ -20,6 +20,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = '0.11.1'
+    INSPEC_VERSION = '0.12.0'
   end
 end