Merge branch 'master' into release-1.1

contiv · Oct 19, 2017 · 67d0ad6 · 67d0ad6
2 parents 0c9e4da + 55e9941
commit 67d0ad6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/install/ansible/env.json b/install/ansible/env.json
@@ -2,7 +2,7 @@
   "docker_version":"__DOCKER_VERSION__", 
   "aci_gw_image":"contiv/aci-gw:__ACI_GW_VERSION__",
   "contiv_network_version":"__CONTIV_VERSION__",
-  "env":{ "http_proxy":"", "HTTP_PROXY":"", "https_proxy":"", "no_proxy":",127.0.0.1,localhost,netmaster" },
+  "env": "{}",
   "etcd_peers_group": "netplugin-master",
   "service_vip": "__NETMASTER_IP__",
   "validate_certs": "no",