Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 19265fb5987f · 2016-06-23T16:15:12.000+03:00
diff --git a/contrib/mmts/tests2/requirements.txt b/contrib/mmts/tests2/requirements.txt
@@ -1,2 +1,2 @@
-git+https://github.com/kelvich/blockade.git@user-defined-network
+git+https://github.com/kelvich/blockade.git@002-allow-cores
 psycopg2

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-git+https://github.com/kelvich/blockade.git@user-defined-network`
	`1`	`+git+https://github.com/kelvich/blockade.git@002-allow-cores`
`2`	`2`	`psycopg2`