diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 53ff266..c395264 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -16,7 +16,6 @@ on: - 'v[0-9]+.[0-9]+.[0-9]+' branches: - main - - master jobs: test: diff --git a/CHANGELOG.md b/CHANGELOG.md index b59cc57..dff0a92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] -- Add additional HTTP headers for call to Themis from Convey -## [1.1.4] +## [v1.1.5] +- Add additional HTTP headers for call to Themis from Convey +- Change default branch name to `main` + +## [v1.1.4] - on connect retry, requery jwt only if it failed before - put two timestamps in connection health file; start conn and current - change health file update interval to 240sec @@ -102,8 +105,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - Initial creation -[Unreleased]: https://github.com/Comcast/parodus/compare/1.1.4...HEAD -[1.1.4]: https://github.com/Comcast/parodus/compare/1.1.3...1.1.4 +[Unreleased]: https://github.com/Comcast/parodus/compare/v1.1.5...HEAD +[1.1.5]: https://github.com/Comcast/parodus/compare/v1.1.4...v1.1.5 +[1.1.4]: https://github.com/Comcast/parodus/compare/1.1.3...v1.1.4 [1.1.3]: https://github.com/Comcast/parodus/compare/1.1.2...1.1.3 [1.1.2]: https://github.com/Comcast/parodus/compare/1.1.1...1.1.2 [1.1.1]: https://github.com/Comcast/parodus/compare/1.0.4...1.1.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c526e9..a8e600c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ cmake_minimum_required(VERSION 2.8.7) -#project(parodus VERSION 1.1.15) +#project(parodus VERSION 1.1.5) project(parodus) include(ExternalProject)