1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-13 13:52:13 +03:00

Merge branch 'release-4.1.6-rc2' into release-4.1.6-rc3

This commit is contained in:
Athanasius 2021-01-11 17:24:42 +00:00
commit c90392ab89
2 changed files with 17 additions and 1 deletions

View File

@ -1,6 +1,22 @@
This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first).
--- ---
Release 4.1.6-rc2
===
* We've applied extra paranoia to some of the application shutdown code to
ensure we're not still trying to handle journal events during this sequence.
We also re-ordered the shutdown sequence, which might help avoid the shutdown
hang.
If you encounter a shutdown hang then please add a comment and log files to
[Application can leave a zombie process on shutdown #678](https://github.com/EDCD/EDMarketConnector/issues/678)
to help us track down the cause and fix it.
* Logging from any name-mangled method should now work properly.
Release 4.1.6-rc1 Release 4.1.6-rc1
=== ===

View File

@ -13,7 +13,7 @@ appcmdname = 'EDMC'
# appversion **MUST** follow Semantic Versioning rules: # appversion **MUST** follow Semantic Versioning rules:
# <https://semver.org/#semantic-versioning-specification-semver> # <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata) # Major.Minor.Patch(-prerelease)(+buildmetadata)
appversion = '4.1.6-rc1' #-rc1+a872b5f' appversion = '4.1.6-rc2' #-rc1+a872b5f'
# For some things we want appversion without (possible) +build metadata # For some things we want appversion without (possible) +build metadata
appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease')) appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease'))
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD' copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'