From 2efa32cf8653c360bca36809826347b542dcd7f4 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Fri, 6 Aug 2021 15:16:31 +0100
Subject: [PATCH] Pre-Release 5.1.3-beta1: appversion & ChangeLog

---
 ChangeLog.md | 31 +++++++++++++++++++++++++++++++
 config.py    |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 83c5e164..98ed6322 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,37 @@ This is the master changelog for Elite Dangerous Market Connector.  Entries are
   in the source (it's not distributed with the Windows installer) for the
   currently used version in a given branch.
 
+Pre-Release 5.1.3-beta1
+===
+
+* Attempt to flush any pending EDSM API data when a Journal `Shutdown` or 
+  `Fileheader` event is seen.  After this the data is dropped.  This ensures
+  that, if the user next logs in to a different commander, the data isn't then
+  sent to the wrong EDSM account.
+
+* Ensure a previous Journal file is fully read/drained before starting 
+  processing of a new one.  In particular this ensures properly seeing the end
+  of a continued Journal file when opening the continuation file.
+
+* Don't force DEBUG level logging to the
+  [plain log file](https://github.com/EDCD/EDMarketConnector/wiki/Troubleshooting#plain-log-file)
+  if `--trace` isn't used to force TRACE level logging.  This means logging
+  *to the plain log file* will once more respect the user-set Log Level, as in
+  the Configuration tab of Settings.
+
+  As its name implies, the [debug log file](https://github.com/EDCD/EDMarketConnector/wiki/Troubleshooting#debug-log-files)
+  will always contain at least DEBUG level logging, or TRACE if forced.
+
+(Plugin) Developers
+---
+
+* New EDMarketConnector option `--trace-on ...` to control if certain TRACE
+  level logging is used or not.  This helps keep the noise down whilst being
+  able to have users activate choice bits of logging to help track down bugs.
+
+  See [Contributing.md](Contributing.md#use-the-appropriate-logging-level) for
+  details.
+
 Release 5.1.2
 ===
 
diff --git a/config.py b/config.py
index 6b9d3016..0a7507de 100644
--- a/config.py
+++ b/config.py
@@ -33,7 +33,7 @@ appcmdname = 'EDMC'
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
 # NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
-_static_appversion = '5.1.3-beta0'
+_static_appversion = '5.1.3-beta1'
 _cached_version: Optional[semantic_version.Version] = None
 copyright = '© 2015-2019 Jonathan Harris, 2020-2021 EDCD'