From 47b0d97313abee1cfcc4837a309af09d7cb5143b Mon Sep 17 00:00:00 2001
From: Dominik Richter <dominik.richter@gmail.com>
Date: Mon, 22 Feb 2016 21:20:56 +0100
Subject: [PATCH] 0.14.2

---
 CHANGELOG.md          | 19 +++++++++++++++++--
 lib/inspec/version.rb |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 597c77a5c..ac3ea663a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,18 @@
 # Change Log
 
-## [0.14.1](https://github.com/chef/inspec/tree/0.14.1) (2016-02-22)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.14.0...0.14.1)
+## [0.14.2](https://github.com/chef/inspec/tree/0.14.2) (2016-02-22)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.1...0.14.2)
+
+**Fixed bugs:**
+
+- fix cc upload [\#483](https://github.com/chef/inspec/pull/483) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- load plugins in the same gem installation [\#482](https://github.com/chef/inspec/pull/482) ([arlimus](https://github.com/arlimus))
+
+## [v0.14.1](https://github.com/chef/inspec/tree/v0.14.1) (2016-02-22)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.14.0...v0.14.1)
 
 **Implemented enhancements:**
 
@@ -12,6 +23,10 @@
 
 - ignore `pax\_global\_header` as valid file [\#480](https://github.com/chef/inspec/pull/480) ([chris-rock](https://github.com/chris-rock))
 
+**Merged pull requests:**
+
+- 0.14.1 [\#481](https://github.com/chef/inspec/pull/481) ([chris-rock](https://github.com/chris-rock))
+
 ## [v0.14.0](https://github.com/chef/inspec/tree/v0.14.0) (2016-02-22)
 [Full Changelog](https://github.com/chef/inspec/compare/v0.13.0...v0.14.0)
 
diff --git a/lib/inspec/version.rb b/lib/inspec/version.rb
index 72efd0b10..56af3d56b 100644
--- a/lib/inspec/version.rb
+++ b/lib/inspec/version.rb
@@ -3,5 +3,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.14.2'.freeze
 end