Merge pull request #44 from drajen/patch-2

Increase deadline to 5 minutes to accommodate slow systems

Makefile

@@ -39,7 +39,7 @@ LD_FLAGS = '-X main.Version=$(VERSION) -X main.Commit=$(COMMIT)'
 
 # gometalinter allows us to have a single target that runs multiple linters in
 # the same fashion.  This variable controls which linters are used.
-LINTER_FLAGS = --vendor --disable-all --enable=vet --enable=vetshadow --enable=golint --enable=ineffassign --enable=goconst --enable=deadcode --enable=dupl --enable=varcheck --enable=gocyclo --enable=misspell
+LINTER_FLAGS = --vendor --disable-all --enable=vet --enable=vetshadow --enable=golint --enable=ineffassign --enable=goconst --enable=deadcode --enable=dupl --enable=varcheck --enable=gocyclo --enable=misspell --deadline=300s
 
 # list of packages
 PACKAGE_LIST =   $(shell export $(GOENV) && go list ./$(PKG_PATH)...| grep -v vendor)
@@ -130,4 +130,4 @@ doryd_docker: doryd; $(info $(A1) doryd_docker)
 	@echo "$(A2) rm current doryd image"
 	-docker image rm kube-storage-controller-dory:edge
 	@echo "$(A2) build doryd image"
-	docker build -t kube-storage-controller-dory:edge -f ./build/docker/doryd/Dockerfile .
+	docker build -t kube-storage-controller-dory:edge -f ./build/docker/doryd/Dockerfile .