Merge pull request hashicorp#252 from hashicorp/master_mergelibrary-v…

…2-stage-one Merges library-v2-stage-one
ruiyun051 · Oct 3, 2017 · 6b7a98d · 6b7a98d
2 parents c701e3c + 1bdba70
commit 6b7a98d
Show file tree

Hide file tree

Showing 51 changed files with 6,676 additions and 2,367 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: go
 
 go:
-    - 1.4
-    - 1.5
     - 1.6
     - tip
 

diff --git a/Makefile b/Makefile
@@ -1,11 +1,14 @@
 DEPS = $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
 
 test:
-	go test -timeout=30s ./...
+	go test -timeout=60s .
 
 integ: test
-	INTEG_TESTS=yes go test -timeout=23s -run=Integ ./...
+	INTEG_TESTS=yes go test -timeout=25s -run=Integ .
 
+fuzz:
+	go test -timeout=300s ./fuzzy
+
 deps:
 	go get -d -v ./...
 	echo $(DEPS) | xargs -n1 go get -d
-Original file line number
+Diff line change
@@ -1,8 +1,6 @@
     language: go
     go:
-        - 1.4
-        - 1.5
         - 1.6
         - tip
@@ Expand Down @@