Merge branch 'master' into pkg-cleanup

This commit is contained in:
risk danger olson 2017-01-10 09:52:11 -07:00 committed by GitHub
commit a8969aec55
3 changed files with 7 additions and 3 deletions

@ -129,8 +129,10 @@ Or if there was an error:
#### Stage 2: 0..N Transfers
After the initiation exchange, git-lfs will send any number of transfer
requests to the stdin of the transfer process.
After the initiation exchange, git-lfs will send any number of transfer
requests to the stdin of the transfer process, in a serial sequence. Once a
transfer request is sent to the process, it awaits a completion response before
sending the next request.
##### Uploads

@ -103,6 +103,8 @@ begin_test "custom-transfer-upload-download"
grep "xfer\[lfstest-customadapter\]:" fetchcustom.log
grep "11 of 11 files" fetchcustom.log
grep "Terminating test custom adapter gracefully" fetchcustom.log
objectlist=`find .git/lfs/objects -type f`
[ "$(echo "$objectlist" | wc -l)" -eq 11 ]
)

@ -86,7 +86,7 @@ func NewCustomAdapterDownloadRequest(oid string, size int64, action *Action) *cu
}
type customAdapterTerminateRequest struct {
MessageType string `json:"type"`
Event string `json:"event"`
}
func NewCustomAdapterTerminateRequest() *customAdapterTerminateRequest {