From ea90c196e95aa4cf081cf849b74bcc51dbf0a89f Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Mon, 22 Feb 2016 14:04:11 +0000
Subject: [PATCH 1/3] Undo change to tools/lint

---
 tools/lint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lint b/tools/lint
index a2c405797..89d534ba8 100755
--- a/tools/lint
+++ b/tools/lint
@@ -148,7 +148,7 @@ function lint_files {
 
 function list_files {
 	if [ $# -gt 0 ]; then
-		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/client/node_modules/)'
+		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/)'
 	else
 		git diff --cached --name-only
 	fi

From 930b53f5459567d79c927951168f3fc73f1c5cd0 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Mon, 22 Feb 2016 14:18:29 +0000
Subject: [PATCH 2/3] Squashed 'tools/' changes from 954b023..c342e83

c342e83 Merge pull request #17 from weaveworks/lint-ignore
07ebcff Update to ignore node_modules and *.generated.go
d76a90a Don't lint codecgen'd code.
cbb0567 Exclude ALL_CAPS warnings from linter

git-subtree-dir: tools
git-subtree-split: c342e833bbed77e73d01da87e5f8038f9f2ce58c
---
 lint | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lint b/lint
index 89d534ba8..22db070c0 100755
--- a/lint
+++ b/lint
@@ -85,7 +85,7 @@ function lint_go {
 		if [ -z "$IGNORE_LINT_COMMENT"  ]; then
 			lintoutput=$(golint "${filename}")
 		else
-			lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports')
+			lintoutput=$(golint "${filename}" | grep -vE 'comment|dot imports|ALL_CAPS')
 		fi
 		if [ -n "$lintoutput" ]; then
 			lint_result=1
@@ -148,7 +148,7 @@ function lint_files {
 
 function list_files {
 	if [ $# -gt 0 ]; then
-		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/)'
+		find "$@" -type f | grep -vE '(^\./\.git|^\./\.pkg|/vendor/|/node_modules/|\.codecgen\.go$|\.generated\.go$)'
 	else
 		git diff --cached --name-only
 	fi

From a0bcb2023c90442fc8ce1d94bfa8a4f0ae46c448 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Mon, 22 Feb 2016 14:19:00 +0000
Subject: [PATCH 3/3] Ignore
 vendor/github.com/ugorji/go/codec/codecgen/codecgen

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 470189556..3c5e1474c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,6 @@ experimental/_integration/_integration
 *npm-debug.log
 app/static.go
 prog/static.go
-vendor/github.com/2opremio/go-1/codec/codecgen/codecgen
+vendor/github.com/ugorji/go/codec/codecgen/codecgen
 *.codecgen.go
 *.generated.go