Merge branch 'master' into wip/ci

saltstack-formulas · May 13, 2019 · 615797e · 615797e
2 parents 5f2256c + 80273e8
commit 615797e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -12,7 +12,9 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|3
 <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|2
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1435085?v=4' width='36' height='36' alt='@blbradley'>|[@blbradley](https://github.com/blbradley)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|1
 <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|1
 
 ---
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.0.3](https://github.com/saltstack-formulas/vault-formula/compare/v1.0.2...v1.0.3) (2019-05-13)
+
+
+### Documentation
+
+* **readme:** improve readme sections ([10e2bde](https://github.com/saltstack-formulas/vault-formula/commit/10e2bde))
+
 ## [1.0.2](https://github.com/saltstack-formulas/vault-formula/compare/v1.0.1...v1.0.2) (2019-05-13)
 
 

diff --git a/FORMULA b/FORMULA
@@ -1,7 +1,7 @@
 name: vault
 os: Debian, Ubuntu, RedHat, Fedora, CentOS, Amazon
 os_family: Debian, RedHat
-version: 1.0.2
+version: 1.0.3
 release: 1
 minimum_version: 2018.3
 summary: Vault formula

diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
@@ -37,9 +37,15 @@ This list is sorted by the number of commits per contributor in *descending* ord
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1435085?v=4' width='36' height='36' alt='@blbradley'>`
      - `@blbradley <https://github.com/blbradley>`_
      - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
+     - `@johnkeates <https://github.com/johnkeates>`_
+     - 1
    * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
      - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
      - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
+     - `@n-rodriguez <https://github.com/n-rodriguez>`_
+     - 1
 
 
 ----

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog
 =========
 
+`1.0.3 <https://github.com/saltstack-formulas/vault-formula/compare/v1.0.2...v1.0.3>`_ (2019-05-13)
+-------------------------------------------------------------------------------------------------------
+
+Documentation
+^^^^^^^^^^^^^
+
+
+* **readme:** improve readme sections (\ `10e2bde <https://github.com/saltstack-formulas/vault-formula/commit/10e2bde>`_\ )
+
 `1.0.2 <https://github.com/saltstack-formulas/vault-formula/compare/v1.0.1...v1.0.2>`_ (2019-05-13)
 -------------------------------------------------------------------------------------------------------