Merge remote-tracking branch 'origin/master' into DRIP_2.0

# Conflicts: # docs/composer_files/beia_docker-compose.yml

Merge remote-tracking branch 'origin/master' into DRIP_2.0
# Conflicts: # docs/composer_files/beia_docker-compose.yml
bd6c5399 · Spiros Koulouzis · bc8149a4 · 94e8092f · bd6c5399 · bc8149a4
Commit bd6c5399 authored Feb 28, 2018 by Spiros Koulouzis
5 changed files
--- a/docs/playbooks/set_dockerhub_credentials2.yml
+++ b/docs/playbooks/set_dockerhub_credentials2.yml
@@ -46,8 +46,8 @@
  - name: Log into DockerHub
    docker_login:
      username: USER
-      password: PASS 
+      password: PASSS 
-      email: EMAIL
+      email: XXXXX
      config_path: /home/vm_user/.docker/config.json
    become: true

--- a/drip-api-1.0-SNAPSHOT.tar.gz
+++ b/drip-api-1.0-SNAPSHOT.tar.gz
--- a/drip-deployer.tar.gz
+++ b/drip-deployer.tar.gz
--- a/drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar
+++ b/drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar
--- a/drip_planner2.tar.gz
+++ b/drip_planner2.tar.gz