From b1cd7a363dfff69c9b362c97171b6324d3a082cb Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Thu, 6 Aug 2020 22:03:50 +0000 Subject: [PATCH] Bump version to 1.6.115 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 7 ++++--- VERSION | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebeba06af7..0b8cc0ee4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # Habitat CHANGELOG - -## [1.6.114](https://github.com/habitat-sh/habitat/tree/1.6.114) (2020-08-06) + +## [1.6.115](https://github.com/habitat-sh/habitat/tree/1.6.115) (2020-08-06) #### Merged Pull Requests -- fix e2e test_license test [#7859](https://github.com/habitat-sh/habitat/pull/7859) ([mwrock](https://github.com/mwrock)) +- fix license environment injection in container exporter [#7860](https://github.com/habitat-sh/habitat/pull/7860) ([mwrock](https://github.com/mwrock)) @@ -25,6 +25,7 @@ - [FIX] Ensure `toToml` helper works properly for tables [#7772](https://github.com/habitat-sh/habitat/pull/7772) ([christophermaier](https://github.com/christophermaier)) #### Merged Pull Requests +- fix license environment injection in container exporter [#7860](https://github.com/habitat-sh/habitat/pull/7860) ([mwrock](https://github.com/mwrock)) - fix e2e test_license test [#7859](https://github.com/habitat-sh/habitat/pull/7859) ([mwrock](https://github.com/mwrock)) - fix e2e test with older launcher [#7856](https://github.com/habitat-sh/habitat/pull/7856) ([mwrock](https://github.com/mwrock)) - Allow version check without license [#7834](https://github.com/habitat-sh/habitat/pull/7834) ([davidMcneil](https://github.com/davidMcneil)) diff --git a/VERSION b/VERSION index 4429012850..c65e8e20da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.114 \ No newline at end of file +1.6.115 \ No newline at end of file