From 839987d37e0bc791d4c19f97a0ca55d65c5199fa Mon Sep 17 00:00:00 2001 From: Reynald Bourtembourg Date: Thu, 23 Apr 2020 12:01:20 +0200 Subject: [PATCH 1/2] Update CHANGELOG for #699 --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cf68e99..d308c9ef8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) -## [9.3.4] - 2020-04-01 +## [9.3.4] - 2020-04-23 ### Fixed - Be compatible with all in-use cppzmq versions ([#530][pr-530], [#561][pr-561], [#273][i-273], [#499][i-499], [#535][i-535]) @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - travis.yml: remove deprecated skip_cleanup ([#683][pr-683]) - Fix memory leak in Attribute::get_att_device_class() ([#677][pr-677]) - Fix crash during alarm state evaluation if attribute value is not set ([#330][i-330], [#681][pr-681]) +- Fix issue where unsubscribing in push_events led to API_EventTimeout ([#686][i-686], [#699][pr-699]) ### Added - Document contributing process and use CODEOWNERS for easier review organization ([#639][pr-639]) @@ -330,5 +331,7 @@ where a client application might show out of date/incorrect values. [pr-677]: https://github.com/tango-controls/cppTango/pull/677 [pr-681]: https://github.com/tango-controls/cppTango/pull/681 [pr-683]: https://github.com/tango-controls/cppTango/pull/683 +[i-686]: https://github.com/tango-controls/cppTango/issues/686 [pr-689]: https://github.com/tango-controls/cppTango/pull/689 -[pr-690]: https://github.com/tango-controls/cppTango/pull/690 \ No newline at end of file +[pr-690]: https://github.com/tango-controls/cppTango/pull/690 +[pr-699]: https://github.com/tango-controls/cppTango/pull/699 From e2a783d3793277f2a0439939b00b636a0734ca90 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Thu, 23 Apr 2020 13:36:14 +0200 Subject: [PATCH 2/2] appveyor.yml: Update personal access token The old one was broken. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b6bc48a6e..107c5eb23 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -336,7 +336,7 @@ deploy: auth_token: # User: cppTango-bot # Personal Access token with repo scope, encrypted via https://ci.appveyor.com/tools/encrypt - secure: KnvPAbdhmiTQxTLOGq7nyNs6d1JYbKVKspPgigzQ3fDrI+nkaxqWCw6UmRkS2Gqe + secure: KNHPeojJrtKOT/EifgS/5GO7URZw2uOU2ZfHnRwIgg4tjffBbv9iFgh/xkwF1XWC artifact: /.*/ repository: tango-controls/cppTango draft: true