From 5985d904ca01eed13644a0625b8981d11d66e101 Mon Sep 17 00:00:00 2001 From: dirtycajunrice Date: Fri, 11 Jan 2019 23:53:26 -0600 Subject: [PATCH] version bump to 1.6.1 master + changelog --- CHANGELOG.md | 21 ++++++++++++++++++++- varken/__init__.py | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e95b7cde..88ae6ffa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Change Log +## [v1.6.1](https://github.com/Boerderij/Varken/tree/v1.6.1) (2019-01-11) +[Full Changelog](https://github.com/Boerderij/Varken/compare/v1.6...v1.6.1) + +**Implemented enhancements:** + +- \[Feature Request\] Unifi Integration [\#79](https://github.com/Boerderij/Varken/issues/79) + +**Fixed bugs:** + +- \[BUG\] Unexpected keyword argument 'langCode' while creating OmbiMovieRequest structure [\#88](https://github.com/Boerderij/Varken/issues/88) + +**Closed issues:** + +- Remove Cisco ASA since Telegraf + SNMP can do the same [\#86](https://github.com/Boerderij/Varken/issues/86) + +**Merged pull requests:** + +- v1.6 Merge [\#90](https://github.com/Boerderij/Varken/pull/85) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) + ## [v1.6](https://github.com/Boerderij/Varken/tree/v1.6) (2019-01-04) [Full Changelog](https://github.com/Boerderij/Varken/compare/v1.5...v1.6) @@ -15,7 +34,7 @@ **Merged pull requests:** -- v1.6 Merge [\#75](https://github.com/Boerderij/Varken/pull/85) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) +- v1.6 Merge [\#85](https://github.com/Boerderij/Varken/pull/85) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) ## [v1.5](https://github.com/Boerderij/Varken/tree/v1.5) (2018-12-30) [Full Changelog](https://github.com/Boerderij/Varken/compare/v1.4...v1.5) diff --git a/varken/__init__.py b/varken/__init__.py index 452f1ada..b9c815f6 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ VERSION = "1.6.1" -BRANCH = 'pre-nightly' +BRANCH = 'master'