Skip to content

Commit

Permalink
Merge branch 'release/4.8.3-4alvistack4' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed Aug 26, 2020
2 parents f807a0a + 2881e56 commit 7ee5a80
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 18 deletions.
2 changes: 0 additions & 2 deletions .ansible-lint

This file was deleted.

7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# Docker Image Packaging for Atlassian Fisheye

## 4.8.2-XalvistackY - TBC
## 4.8.3-XalvistackY - TBC

### Major Changes

## 4.8.3-4alvistack4 - 2020-08-26

### Major Changes

- Upgrade minimal Ansible Lint support to 4.3.2
- Upgrade Travis CI test as Ubuntu Focal based
- Upgrade minimal Ansible support to 2.10.0

Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ansible~=2.10.0a9
ansible-lint~=4.3.1
ansible>=2.10.0a9,<2.11.0
ansible-lint>=4.3.2,<4.4.0
ansible-runner
ansible-runner-http
argcomplete
docker
flake8
jmespath
molecule~=3.0.2
molecule>=3.0.8,<3.1.0
molecule-vagrant
netaddr
openshift
Expand Down
2 changes: 1 addition & 1 deletion roles/catatonit
2 changes: 1 addition & 1 deletion roles/cvs
2 changes: 1 addition & 1 deletion roles/fisheye
2 changes: 1 addition & 1 deletion roles/git
2 changes: 1 addition & 1 deletion roles/gosu
Submodule gosu updated 3 files
+0 −2 .ansible-lint
+6 −1 CHANGELOG.md
+3 −3 requirements.txt
2 changes: 1 addition & 1 deletion roles/locales
2 changes: 1 addition & 1 deletion roles/mercurial
2 changes: 1 addition & 1 deletion roles/openjdk
2 changes: 1 addition & 1 deletion roles/perforce
2 changes: 1 addition & 1 deletion roles/python
2 changes: 1 addition & 1 deletion roles/svn
Submodule svn updated 3 files
+0 −2 .ansible-lint
+6 −1 CHANGELOG.md
+3 −3 requirements.txt
2 changes: 1 addition & 1 deletion roles/timezone

0 comments on commit 7ee5a80

Please sign in to comment.