Merge branch 'release/7.4.11-4alvistack1' into master

alvistack · Oct 14, 2020 · 52ee800 · 52ee800
2 parents b12619a + 26bfc3c
commit 52ee800
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Docker Image Packaging for PHP
 
-## 7.4.10-XalvistackY - TBC
+## 7.4.11-XalvistackY - TBC
+
+### Major Changes
+
+## 7.4.11-4alvistack1 - 2020-10-14
 
 ### Major Changes
 

diff --git a/ansible-galaxy-requirements.yml b/ansible-galaxy-requirements.yml
@@ -15,6 +15,10 @@
 # limitations under the License.
 
 collections:
+  - name: community.general
+    src: https://galaxy.ansible.com
+    version: ">=1.0.0,<2.0.0"
+
   - name: community.kubernetes
     src: https://galaxy.ansible.com
     version: ">=1.0.0,<2.0.0"

diff --git a/roles/catatonit b/roles/catatonit
diff --git a/roles/git b/roles/git
diff --git a/roles/gosu b/roles/gosu
diff --git a/roles/locales b/roles/locales
diff --git a/roles/php b/roles/php
diff --git a/roles/python b/roles/python
diff --git a/roles/timezone b/roles/timezone
+2 −0		CHANGELOG.md
+4 −0		ansible-galaxy-requirements.yml
+0 −7		tasks/main.yml
+3 −0		CHANGELOG.md
+4 −0		ansible-galaxy-requirements.yml
+0 −4		tasks/debian.yml
+0 −3		tasks/main.yml
+0 −4		tasks/redhat.yml
+0 −3		tasks/suse.yml