Merge branch 'PGPROEE10' into PGPROEE10_scheduler

Author: Vladimir Ershov

.dockerignore

@@ -0,0 +1,7 @@
+*/*/.git
+.git
+.vscode
+*.yml
+*/*/*.yml
+Dockerfile
+

Dockerfile

@@ -0,0 +1,22 @@
+FROM alpine:3.4
+
+RUN apk add --update gcc libc-dev bison flex readline-dev zlib-dev perl make diffutils gdb iproute2 musl-dbg
+
+# there is already accidental postgres user in alpine
+# RUN addgroup pg && adduser -h /pg -D -G pg pg
+RUN mkdir /pg && chown postgres:postgres pg
+
+ENV LANG en_US.utf8
+ENV CFLAGS -O0
+ENV PATH /pg/install/bin:$PATH
+
+COPY ./ /pg/src
+
+# crutch to allow regression test to write there
+RUN mkdir -p /pg/src/src/test/regress/results && \
+	chown postgres:postgres /pg/src/src/test/regress/results
+
+RUN cd /pg/src && \
+	./configure --enable-cassert --enable-debug --prefix=/pg/install && \
+	make -j 4 install
+

contrib/Makefile

@@ -37,6 +37,7 @@ SUBDIRS = \
 		jsquery \
 		lo		\
 		ltree		\
+		mmts	\
 		oid2name	\
 		online_analyze \
 		pageinspect	\
@@ -48,6 +49,7 @@ SUBDIRS = \
 		pg_pathman \
 		pg_prewarm	\
 		pg_query_state \
+		pg_shardman	\
 		pg_standby	\
 		pg_stat_statements \
 		pg_transfer \

contrib/mmts/.gitignore

@@ -0,0 +1,2 @@
+tests/node*
+tmp_check