Auto merge of #19 - mozillazg:develop, r=mozillazg

v0.5.1

.travis.yml

@@ -5,6 +5,7 @@ go:
   - 1.3
   - 1.4
   - 1.5
+  - 1.6
   - tip
 
 sudo: false
@@ -13,16 +14,13 @@ before_install:
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
   - go get github.com/axw/gocov/gocov
   - go get github.com/mattn/goveralls
-  - go get github.com/bitly/go-simplejson
-  - go get golang.org/x/net/publicsuffix
-  - go get golang.org/x/net/proxy
-  - go get github.com/bmizerany/assert
+  - go get github.com/tools/godep
 
 install:
+  - godep restore
   - go build
 
 script:
-  - echo "test.txtabc" > test.txt
   - go test -v
   - if [[ $TRAVIS_GO_VERSION != 'tip' ]]; then $HOME/gopath/bin/goveralls -service=travis-ci; fi
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.1 (2016-06-05)
+
+* add vendor/
+
 
 ## 0.5.0 (2015-11-15)
 

form_test.go

@@ -46,7 +46,7 @@ func TestPostFiles(t *testing.T) {
 	}
 	_, _ = w.Write(f)
 	w.Flush()
-	f2, _ := os.Open("test.txt")
+	f2, _ := os.Open("doc.go")
 	defer f2.Close()
 	req.Data = map[string]string{
 		"key": "value",

request.go

@@ -10,7 +10,7 @@ import (
 	"golang.org/x/net/publicsuffix"
 )
 
-const Version = "0.5.0"
+const Version = "0.5.1"
 
 type FileField struct {
 	FieldName string