Merge branch 'master' into s3

This commit is contained in:
Marius 2016-01-05 18:22:26 +01:00
commit cfba2e3b94
2 changed files with 5 additions and 5 deletions

View File

@ -7,6 +7,8 @@ go:
- 1.6
- tip
sudo: false
env:
global:
- GO15VENDOREXPERIMENT=1
@ -16,12 +18,10 @@ matrix:
- go: tip
before_install:
- go get golang.org/x/tools/cmd/cover
- go get .
- go get ./...
script:
- go test -v -coverprofile=cover.out || go test -v
- go test -v ./filestore -coverprofile=cover.out || go test -v ./filestore
- go test ./...
before_deploy:
- go get github.com/laher/goxc

View File

@ -1,7 +1,7 @@
# tusd
[![Build Status](https://travis-ci.org/tus/tusd.svg?branch=master)](https://travis-ci.org/tus/tusd)
[![Build status](https://ci.appveyor.com/api/projects/status/2y6fa4nyknoxmyc8?svg=true)](https://ci.appveyor.com/project/Acconut/tusd)
[![Build status](https://ci.appveyor.com/api/projects/status/2y6fa4nyknoxmyc8/branch/master?svg=true)](https://ci.appveyor.com/project/Acconut/tusd/branch/master)
tusd is the official reference implementation of the [tus resumable upload
protocol](http://www.tus.io/protocols/resumable-upload.html). The protocol