From 658eb63bdd62ae59a75115298dc80142cf534a03 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Mon, 12 Feb 2018 19:06:20 +0000 Subject: [PATCH] Update CHANGELOG.md to reflect the promotion of 1.51.18 --- CHANGELOG.md | 23 ++++++++++------------- Dockerfile | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ee8c493b..3025e9cef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,20 @@ # Change Log - -## [v1.51.18](https://github.com/chef/inspec/tree/v1.51.18) (2018-02-12) - -#### Merged Pull Requests -- Add json fields to schema and add tests. [#2618](https://github.com/chef/inspec/pull/2618) ([jquick](https://github.com/jquick)) + - -### Changes since 1.51.15 release - -#### Merged Pull Requests -- Add json fields to schema and add tests. [#2618](https://github.com/chef/inspec/pull/2618) ([jquick](https://github.com/jquick)) -- Allow ad-hoc runners to use rspec formats. [#2621](https://github.com/chef/inspec/pull/2621) ([jquick](https://github.com/jquick)) -- Force a default reporter for ad-hoc runners [#2610](https://github.com/chef/inspec/pull/2610) ([jquick](https://github.com/jquick)) + +## [v1.51.18](https://github.com/chef/inspec/tree/v1.51.18) (2018-02-12) + +#### Merged Pull Requests +- Force a default reporter for ad-hoc runners [#2610](https://github.com/chef/inspec/pull/2610) ([jquick](https://github.com/jquick)) +- Allow ad-hoc runners to use rspec formats. [#2621](https://github.com/chef/inspec/pull/2621) ([jquick](https://github.com/jquick)) +- Add json fields to schema and add tests. [#2618](https://github.com/chef/inspec/pull/2618) ([jquick](https://github.com/jquick)) + + ## [v1.51.15](https://github.com/chef/inspec/tree/v1.51.15) (2018-02-09) #### Merged Pull Requests @@ -29,7 +27,6 @@ - Refactors grub_conf doc sligtly; adds os metadata [#2537](https://github.com/chef/inspec/pull/2537) ([kagarmoe](https://github.com/kagarmoe)) - Use the version of LicenseScout that comes with the Omnibus gem. [#2554](https://github.com/chef/inspec/pull/2554) ([tduffield](https://github.com/tduffield)) - Fix runner report and json newline [#2601](https://github.com/chef/inspec/pull/2601) ([jquick](https://github.com/jquick)) - ## [v1.51.6](https://github.com/chef/inspec/tree/v1.51.6) (2018-02-08) diff --git a/Dockerfile b/Dockerfile index 62baec08a..7e4bb07bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ruby:alpine MAINTAINER Chef Software, Inc. -ARG VERSION=1.51.15 +ARG VERSION=1.51.18 ARG GEM_SOURCE=https://rubygems.org RUN mkdir -p /share