Merge branch 'master' into standalone-binary

neXenio · Aug 22, 2019 · 97c7df6 · 97c7df6
2 parents 18fe13d + 2c29e1f
commit 97c7df6
Show file tree

Hide file tree

Showing 26 changed files with 1,516 additions and 738 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 build/
 dist/
 _site/
+site/
 kapitan.egg-info/
 tags
 .python-version

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.24.0-rc.3:
+- Add reveal_maybe custom jinja2 filter (#332)
+- Add support to import Helm input type (#307)
+
 ## 0.24.0-rc.2:
 - Make boto3 requirement more flexible (#320)
 - Add kubernetes manifest validation (#317)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
     build/
     dist/
     _site/
+    site/
     kapitan.egg-info/
     tags
     .python-version
@@ Expand Down @@