From 2a1a9c1dbe581320068da2a3956ebb5607893d7b Mon Sep 17 00:00:00 2001
From: Chef Expeditor <eng-services-ops+chef-ci@chef.io>
Date: Thu, 28 Sep 2017 20:47:25 +0000
Subject: [PATCH] Update CHANGELOG.md to reflect the promotion of 1.40.0 to
 stable

---
 CHANGELOG.md | 19 ++++++++-----------
 Dockerfile   |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e1d08f22..4c475822e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,18 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 1.40.0 -->
-## [v1.40.0](https://github.com/chef/inspec/tree/v1.40.0) (2017-09-27)
-
-#### New Resources
-- firewalld resource: inspect the status and configuration of firewalld [#2074](https://github.com/chef/inspec/pull/2074) ([dromazmj](https://github.com/dromazmj))
+<!-- latest_release -->
 <!-- latest_release -->
 
-<!-- release_rollup since=1.39.1 -->
-### Changes since 1.39.1 release
-
-#### New Resources
-- firewalld resource: inspect the status and configuration of firewalld [#2074](https://github.com/chef/inspec/pull/2074) ([dromazmj](https://github.com/dromazmj)) <!-- 1.40.0 -->
+<!-- release_rollup -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v1.40.0](https://github.com/chef/inspec/tree/v1.40.0) (2017-09-28)
+
+#### New Resources
+- firewalld resource: inspect the status and configuration of firewalld [#2074](https://github.com/chef/inspec/pull/2074) ([dromazmj](https://github.com/dromazmj))
+<!-- latest_stable_release -->
+
 ## [v1.39.0](https://github.com/chef/inspec/tree/v1.39.0) (2017-09-25)
 
 #### New Resources
@@ -23,7 +21,6 @@
 
 #### Merged Pull Requests
 - Bump train to 0.28 to allow for more net-ssh versions [#2185](https://github.com/chef/inspec/pull/2185) ([adamleff](https://github.com/adamleff))
-<!-- latest_stable_release -->
 
 ## [v1.38.8](https://github.com/chef/inspec/tree/v1.38.8) (2017-09-23)
 
diff --git a/Dockerfile b/Dockerfile
index 6457033ed..ab07f20bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ruby:alpine
 MAINTAINER Chef Software, Inc. <docker@chef.io>
 
-ARG VERSION=1.39.1
+ARG VERSION=1.40.0
 ARG GEM_SOURCE=https://rubygems.org
 
 RUN mkdir /share