From ddd53a985efcadaa6c6e9277ca27ac6b6454e0be Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Fri, 28 May 2021 14:55:35 +0200 Subject: [PATCH 1/2] prepare 1.5.1 release --- CHANGELOG.md | 8 ++++---- appinfo/info.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c03b867..2c4c7ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). -## [Unreleased] - XXXX-XX-XX +## [1.5.1] - 2021-05-28 ### Fixed - Use legacy-encoding setting for HSM also [#269](https://github.com/owncloud/encryption/issues/269) - -- `fix-encrypted-version` command restores value to original if no fix is found [#269](https://github.com/owncloud/encryption/issues/269) +- `fix-encrypted-version` command restores value to original if no fix is found [#275](https://github.com/owncloud/encryption/issues/275) ## [1.5.0] - 2021-03-11 @@ -44,5 +43,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Issues with recreating masterkeys when HSM is used [#128](https://github.com/owncloud/encryption/pull/128) -[Unreleased]: https://github.com/owncloud/encryption/compare/v1.5.0...HEAD +[Unreleased]: https://github.com/owncloud/encryption/compare/v1.5.1...HEAD +[1.5.1]: https://github.com/owncloud/encryption/compare/v1.5.0...v1.5.1 [1.5.0]: https://github.com/owncloud/encryption/compare/v1.4.0...v1.5.0 diff --git a/appinfo/info.xml b/appinfo/info.xml index 7d70da4..c54e726 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -19,7 +19,7 @@ admin-encryption false - 1.5.0 + 1.5.1 security From 133343e949bc4c970b93db60d41e1e874ac35ee8 Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Mon, 21 Jun 2021 21:46:13 +0200 Subject: [PATCH 2/2] prepare merge back to master --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c4c7ee..9ba5f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). +## [Unreleased] - XXXX-XX-XX + + ## [1.5.1] - 2021-05-28 ### Fixed