Merge branch 'devel' into non-root-docker-tests

2024-10-30 22:21:13 +03:00 · 2018-10-10 14:22:09 +02:00 · 2018-10-10 14:22:09 +02:00 · 22c831ff31
commit 22c831ff31
parent 5d22fc2bd7 17dc6bf5a1
3 changed files with 4 additions and 4 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -86,8 +86,8 @@ If you're not using Docker for Mac, or Docker for Windows, you may need, or choo

 The AWX UI requires the following:

- Node 6.x LTS version
- NPM 3.x LTS
+- Node 8.x LTS
+- NPM 6.x LTS

 ### Build the environment

--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@ -1,6 +1,6 @@
 apache-libcloud==2.2.1
 appdirs==1.4.2
-asgi-amqp==1.1.1
+asgi-amqp==1.1.2
 asgiref==1.1.2
 azure==3.0.0
 backports.ssl-match-hostname==3.5.0.1
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@ -10,7 +10,7 @@ anyjson==0.3.3            # via kombu
 apache-libcloud==2.2.1
 appdirs==1.4.2
 argparse==1.4.0           # via uwsgitop
-asgi-amqp==1.1.1
+asgi-amqp==1.1.2
 asgiref==1.1.2
 asn1crypto==0.24.0        # via cryptography
 attrs==17.4.0             # via automat, service-identity