diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d16ae9c4f..0d4d2d2c2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,13 +1,13 @@ Change Log ========== All notable changes to this project will be documented in this file. -This project adheres to `Semantic Versioning `_. +This project adheres to `Semantic Versioning `_ after 2-1. -`Unreleased`_ - unreleased --------------------------- -Added: +`2-1`_ - 2017-08-30 +------------------- +Changed: -- Nothing yet +- Major refactor, many breaking changes `2-0a6`_ - 2016-10-03 --------------------- @@ -54,7 +54,8 @@ Added: - Initial release with hello world and websocket comms -.. _Unreleased: https://github.com/dls-controls/pymalcolm/compare/2-0a6...HEAD +.. _Unreleased: https://github.com/dls-controls/pymalcolm/compare/2-1...HEAD +.. _2-0a6: https://github.com/dls-controls/pymalcolm/compare/2-0a6...2-1 .. _2-0a6: https://github.com/dls-controls/pymalcolm/compare/2-0a5...2-0a6 .. _2-0a5: https://github.com/dls-controls/pymalcolm/compare/2-0a4...2-0a5 .. _2-0a4: https://github.com/dls-controls/pymalcolm/compare/2-0a3...2-0a4 diff --git a/malcolm/version.py b/malcolm/version.py index 929e1b47c..d980f276a 100644 --- a/malcolm/version.py +++ b/malcolm/version.py @@ -1 +1 @@ -__version__ = '2.1a1' +__version__ = '2.1'