Merge branch 'sb/http-flaky-test-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:49 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:49 +0000 (14:32 -0700)
commit8f6f1771da430442f81027714519eaeadcbaa01e
tree5d77f3579348c6c4311eafe4783d3bd87613bd90
parent2c3cb52c6c5868410a6aa8f0c6c9ee89dbe4bb15
parent362d8b6e0d313e0e06553f5c390dc7f2172c0569
Merge branch 'sb/http-flaky-test-fix' into maint

A test script for the HTTP service had a timing dependent bug,
which was fixed.

* sb/http-flaky-test-fix:
  t5561: get rid of racy appending to logfile
t/t5560-http-backend-noserver.sh
t/t5561-http-backend.sh