Merge pull request #4478 from RasaHQ/merge_1.2.x

Merge 1.2.x
RasaHQ · Sep 23, 2019 · 22a7457 · 22a7457
2 parents 73e9c97 + 46531c1
commit 22a7457
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -81,6 +81,7 @@ Changed
 -------
 - Pin gast to == 0.2.2
 
+
 [1.3.0] - 2019-09-05
 ^^^^^^^^^^^^^^^^^^^^
 
@@ -168,6 +169,25 @@ Removed
 -------
 - Removed ``--report`` argument from ``rasa test nlu``. All output files are stored in the ``--out`` directory.
 
+
+[1.2.9] - 2019-09-17
+^^^^^^^^^^^^^^^^^^^^
+
+Fixed
+-----
+- Correctly pass SSL flag values to x CLI command (backport of
+
+
+[1.2.8] - 2019-09-10
+^^^^^^^^^^^^^^^^^^^^
+
+Fixed
+-----
+- SQL tracker events are retrieved ordered by timestamps. This fixes interactive
+  learning events being shown in the wrong order. Backport of ``1.3.2`` patch
+  (PR #4427).
+
+
 [1.2.7] - 2019-09-02
 ^^^^^^^^^^^^^^^^^^^^
 

diff --git a/rasa/cli/x.py b/rasa/cli/x.py
@@ -79,6 +79,9 @@ def _rasa_service(
         enable_api=True,
         jwt_secret=args.jwt_secret,
         jwt_method=args.jwt_method,
+        ssl_certificate=args.ssl_certificate,
+        ssl_keyfile=args.ssl_keyfile,
+        ssl_password=args.ssl_password,
     )