From 33ecb98e4457c2f74787b81171cc2c4585269e72 Mon Sep 17 00:00:00 2001
From: Carl Oscar Aaro <hello@carloscar.com>
Date: Tue, 15 Sep 2020 17:24:07 +0200
Subject: [PATCH] 0.18.0

---
 CHANGES.rst              | 8 ++++++++
 tomodachi/__version__.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index bfc26c7e3..5bafdb94d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,14 @@
 Changes
 =======
 
+0.18.0 (2020-09-15)
+-------------------
+- Changed the order of when to execute the service's own
+  ``_stop_service()`` function, to always run after active HTTP
+  requests has finished executing, as well as awaiting ongoing AMQP
+  before finally running the user defined function.
+
+
 0.17.1 (2020-06-16)
 -------------------
 - Updated generated proto class using protoc 3.12.2 for messages
diff --git a/tomodachi/__version__.py b/tomodachi/__version__.py
index f08aee70b..9e80c6880 100644
--- a/tomodachi/__version__.py
+++ b/tomodachi/__version__.py
@@ -1,4 +1,4 @@
-__version_info__ = (0, 17, 1)
+__version_info__ = (0, 18, 0)
 __version__ = ''.join(['.{}'.format(str(n)) if type(n) is int else str(n) for n in __version_info__]).replace('.', '', 1 if type(__version_info__[0]) is int else 0)
 
 if __name__ == "__main__":