Merge remote-tracking branch 'origin/develop'

When updating develop and master branches for v8.3.0 we used squash strategy in
Pull Requests. This caused several merge conflicts as the squashed commit had
different shas. This merge aims to remedy this trivial problem

Conflicts:
	.travis.yml
	CHANGELOG.md
	Dockerfile
	Dockerfile-alpine
	docker-compose.yml

.travis.yml

@@ -1,4 +1,4 @@
 sudo: required
 services: [ docker ]
 script:
-  - docker build -t citusdata/citus:8.3.0 .
+  - docker build -t citusdata/citus:8.3.1 .

CHANGELOG.md

@@ -1,3 +1,7 @@
+### citus-docker v8.3.1.docker (July 29, 2019) ###
+
+* Bump Citus version to 8.3.1
+
 ### citus-docker v8.3.0.docker (July 10, 2019) ###
 
 * Bump Citus version to 8.3.0

Dockerfile

@@ -1,5 +1,5 @@
 FROM postgres:11.4
-ARG VERSION=8.3.0
+ARG VERSION=8.3.1
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \

Dockerfile-alpine

@@ -1,5 +1,5 @@
 FROM postgres:11.4-alpine
-ARG VERSION=8.3.0
+ARG VERSION=8.3.1
 LABEL maintainer="Citus Data https://citusdata.com" \
       org.label-schema.name="Citus" \
       org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \

docker-compose.yml

@@ -3,11 +3,11 @@ version: '2.1'
 services:
   master:
     container_name: "${COMPOSE_PROJECT_NAME:-citus}_master"
-    image: 'citusdata/citus:8.3.0'
+    image: 'citusdata/citus:8.3.1'
     ports: ["${MASTER_EXTERNAL_PORT:-5432}:5432"]
     labels: ['com.citusdata.role=Master']
   worker:
-    image: 'citusdata/citus:8.3.0'
+    image: 'citusdata/citus:8.3.1'
     labels: ['com.citusdata.role=Worker']
     depends_on: { manager: { condition: service_healthy } }
   manager: