From f47652309431150b0df948ab8c841387ba60deb5 Mon Sep 17 00:00:00 2001
From: Jan Graichen <jgraichen@altimos.de>
Date: Fri, 31 Jan 2020 15:12:31 +0100
Subject: [PATCH] Release 1.2.0

---
 CHANGELOG.md |  9 +++++++--
 README.md    | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa36b35..294929b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,11 @@ 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.2.0] - 2020-01-31
 ### Added
 - Provide `basedir` context variable for absolute includes, e.g. `!include {{ basedir }}/files/config.ini`
+- Support loading pillar and renderer modules via gitfs and sync runner
 
 ## [1.1.0] - 2019-03-10
 ### Added
@@ -15,8 +18,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 1.0.0 - 2018-11-16
 ### Added
-- - First version of ext pillar
+- First version of ext pillar
+  - First version of ext pillar
   - Yamlet and Text renderer
 
-[unreleased]: https://github.com/:jgraichen/salt-tower/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/jgraichen/salt-tower/compare/v1.2.0...HEAD
+[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/README.md b/README.md
index c8763f3..b05747d 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,29 @@ Recommended installation is using `pip` / `pip3` on the salt master:
 $ pip install salt-tower
 ```
 
+#### Using GitFS
+
+You can include this repository as a gitfs root on synchronize runners on the master:
+
+```yaml
+gitfs_remotes:
+- https://github.com/jgraichen/salt-tower.git:
+  - base: v1.2.0
+```
+
+Sync all modules:
+
+```
+$ salt-run saltutil.sync_all
+pillar:
+    - pillar.tower
+renderers:
+    - renderers.text
+    - renderers.yamlet
+```
+
+Please note that *everything* in this repository would be merged with your other roots.
+
 #### Manual installation
 
 Install the extension files from the `salt_tower/{pillar,renderers}` directories into the `extension_modules` directory configured in salt.