Prepared for release of 2.14.1 and fixed rebase

CHANGELOG

@@ -1,11 +1,7 @@
 --- CHANGELOG ---
---- Future ---
+--- PyFMI-2.14.1 ---
     * Changed custom result handling for the Master algorithm to instead use a single ResultHandler for each model.
       A dictionary of the form {model: ResultHandler} needs to be supplied to the option.
-    * Added prediction of the size of the result to get early feedback if it will reach the limit or not.
-    * Added option to limit the size of the result ("result_max_size"), default set to 2GB.
-    * Added method ResultDymolaBinary.get_variables_data. Included some minor refactorization.
-      The new method allows for retrieving partial trajectories, and multiple trajectories at once.
 
 --- PyFMI-2.14.0 ---
     * Updated the error message displayed when loading FMUs with needsExecutionTool set to True.

doc/sphinx/source/changelog.rst

@@ -2,6 +2,10 @@
 ==========
 Changelog
 ==========
+--- PyFMI-2.14.1 ---
+    * Changed custom result handling for the Master algorithm to instead use a single ResultHandler for each model.
+      A dictionary of the form {model: ResultHandler} needs to be supplied to the option.
+
 --- PyFMI-2.14.0 ---
     * Updated the error message displayed when loading FMUs with needsExecutionTool set to True.
     * Loading unzipped FMUs now also works with relative paths.

doc/sphinx/source/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.14.0'
+version = '2.14.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.14.0'
+release = '2.14.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -38,7 +38,7 @@
 NAME = "PyFMI"
 AUTHOR = "Modelon AB"
 AUTHOR_EMAIL = ""
-VERSION = "2.14.0"
+VERSION = "2.14.1"
 LICENSE = "LGPL"
 URL = "https://github.com/modelon-community/PyFMI"
 DOWNLOAD_URL = "https://github.com/modelon-community/PyFMI/releases"