Merge CIP code

2019-05-10 10:53:48 +01:00
parent 4a3bdf3b53
commit c079c1b60d
17 changed files with 274 additions and 32 deletions
--- a/test/docker/devconfig_test.go
+++ b/test/docker/devconfig_test.go
@@ -138,7 +138,7 @@ func TestDevWebDisabled(t *testing.T) {
 		Env: []string{
 			"LICENSE=accept",
 			"MQ_QMGR_NAME=qm1",
-			"MQ_BETA_ENABLE_WEB_SERVER=false",
+			"MQ_ENABLE_EMBEDDED_WEB_SERVER=false",
 		},
 	}
 	id := runContainer(t, cli, &containerConfig)