Skip to content

Commit

Permalink
Release 1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jgraichen committed May 11, 2020
1 parent 54c69cc commit 730c72f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
Expand Down

0 comments on commit 730c72f

Please sign in to comment.