v1.7.0 Merge

CHANGELOG.md

@@ -1,7 +1,24 @@
 # Change Log
 
-## [v1.6.8](https://github.com/Boerderij/Varken/tree/v1.6.8) (2019-04-18)
+## [v1.7.0](https://github.com/Boerderij/Varken/tree/v1.7.0) (2019-05-05)
-[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.7...v1.6.8)
+[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.8...v1.7.0)
+
+**Implemented enhancements:**
+
+- \[ENHANCEMENT\] Add album and track totals to artist library from Tautulli [\#127](https://github.com/Boerderij/Varken/issues/127)
+- \[Feature Request\] No way to show music album / track count [\#125](https://github.com/Boerderij/Varken/issues/125)
+
+**Fixed bugs:**
+
+- \[BUG\] Invalid retention policy name causing retention policy creation failure [\#129](https://github.com/Boerderij/Varken/issues/129)
+- \[BUG\] Unifi errors on unnamed devices [\#126](https://github.com/Boerderij/Varken/issues/126)
+
+**Merged pull requests:**
+
+- v1.7.0 Merge [\#131](https://github.com/Boerderij/Varken/pull/131) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
+
+## [1.6.8](https://github.com/Boerderij/Varken/tree/1.6.8) (2019-04-19)
+[Full Changelog](https://github.com/Boerderij/Varken/compare/1.6.7...1.6.8)
 
 **Implemented enhancements:**
 

README.md

@@ -58,6 +58,4 @@ do not include database creation, please ensure you create an influx database
 named `varken`
 
 ### Grafana
-[Grafana Installation Documentation](https://wiki.cajun.pro/books/varken/page/grafana) 
+[Grafana Installation/Dashboard Documentation](https://wiki.cajun.pro/books/varken/page/grafana) 
-
-Official dashboard installation instructions can be found in the [wiki](https://wiki.cajun.pro/books/varken/page/grafana)

varken/__init__.py

@@ -1,2 +1,2 @@
 VERSION = "1.7.0"
-BRANCH = 'develop'
+BRANCH = 'master'