Merge branch 'master' into bazelrc

rshriram · Jan 6, 2017 · 7958b1e · 7958b1e
2 parents 1d005dc + e2fec35
commit 7958b1e
Show file tree

Hide file tree

Showing 7 changed files with 838 additions and 819 deletions.
diff --git a/src/envoy/prototype/README.md b/src/envoy/prototype/README.md
@@ -29,10 +29,10 @@ This Proxy will use Envoy and talk to Mixer server.
 
   The server will run at port 9091
 
-* Start backend Echo server. At ESP repo (https://github.com/cloudendpoints/esp)
+* Start backend Echo server.
 
 ```
-  cd test/echo
+  cd test/backend/echo
   npm install
   node echo.js
 ```

diff --git a/src/envoy/prototype/envoy-esp.conf b/src/envoy/prototype/envoy-esp.conf
@@ -34,7 +34,7 @@
                 "type": "both",
                 "name": "esp",
                 "config": {
-                  "service_config": "src/envoy/prototype/service_config.json",
+                  "service_config": "src/envoy/prototype/generic_service_config.json",
                   "server_config": "src/envoy/prototype/server_config.pb.txt"
                 }
               },