Merge pull request #631 from weaveworks/cleanup

General Cleanup
weaveworks · Nov 6, 2015 · 05c11ef · 05c11ef
2 parents d520662 + 9877a21
commit 05c11ef
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 86 deletions.
diff --git a/app/origin_host.go b/app/origin_host.go
diff --git a/app/origin_host_test.go b/app/origin_host_test.go
diff --git a/app/router.go b/app/router.go
@@ -71,8 +71,6 @@ func Router(c collector) *mux.Router {
 		gzipHandler(topologyRegistry.captureRenderer(c, handleNode)))
 	get.MatcherFunc(URLMatcher("/api/topology/{topology}/{local}/{remote}")).HandlerFunc(
 		gzipHandler(topologyRegistry.captureRenderer(c, handleEdge)))
-	get.MatcherFunc(URLMatcher("/api/origin/host/{id}")).HandlerFunc(
-		gzipHandler(makeOriginHostHandler(c)))
 	get.HandleFunc("/api/report", gzipHandler(makeRawReportHandler(c)))
 	get.PathPrefix("/").Handler(http.FileServer(FS(false))) // everything else is static
 

diff --git a/client/Dockerfile b/client/Dockerfile
@@ -3,4 +3,4 @@ WORKDIR /home/weave
 COPY package.json /home/weave/
 # Dont install optional developer tools
 RUN npm install --no-optional
-COPY webpack.local.config.js webpack.production.config.js server.js .eslintrc /home/weave/
+COPY webpack.local.config.js webpack.production.config.js server.js .eslintrc .eslintignore /home/weave/