diff --git a/CHANGELOG.md b/CHANGELOG.md index f079e34..faeab30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.3.0] - 2020-05-11 ### Added - Added `merge-last`, `merge-first`, `remove` and `overwrite` merge strategies for dictionaries - Improve logging source and exception for rendering errors (#10) @@ -30,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - First version of ext pillar - Yamlet and Text renderer -[unreleased]: https://github.com/jgraichen/salt-tower/compare/v1.2.0...HEAD +[unreleased]: https://github.com/:jgraichen/salt-tower/compare/v1.3.0...HEAD +[1.3.0]: https://github.com/jgraichen/salt-tower/compare/v1.2.0...v1.3.0 [1.2.0]: https://github.com/jgraichen/salt-tower/compare/v1.1.0...v1.2.0 [1.1.0]: https://github.com/jgraichen/salt-tower/compare/v1.0.0...v1.1.0 diff --git a/setup.py b/setup.py index a89fa8d..a66bd25 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="salt-tower", - version="1.2.0", + version="1.3.0", author="Jan Graichen", author_email="jgraichen@altimos.de", description="A Flexible External Salt Pillar Module", @@ -18,7 +18,6 @@ "Environment :: Plugins", "Intended Audience :: System Administrators", "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", "Topic :: System :: Systems Administration", ],