Merge v1.2.1-master

Signed-off-by: Emile Vauge <emile@vauge.com>
traefik · Apr 11, 2017 · aeb1718 · aeb1718
1 parent a590155
commit aeb1718
Show file tree

Hide file tree

Showing 396 changed files with 27,252 additions and 9,950 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ TRAEFIK_ENVS := \
 	-e VERSION \
 	-e CODENAME
 
-SRCS = $(shell git ls-files '*.go' | grep -v '^external/')
+SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/' | grep -v '^integration/vendor/')
 
 BIND_DIR := "dist"
 TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/containous/traefik/$(BIND_DIR)"