Merge branch 'ls/travis-update-p4-and-lfs' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:16 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:16 +0000 (10:57 -0800)
commit5496caa0483a1ced7ea8a306fba2f06bef5b17db
tree49a5ac9c634d385fadd8bc91bb9d3796c0beb375
parentdb652e691a63b8901db44602ac7bd5a3a10e0be4
parent5f703e8f023f080972e9ed1413ffb98031af4da2
Merge branch 'ls/travis-update-p4-and-lfs' into next

The default Travis-CI configuration specifies newer P4 and GitLFS.

* ls/travis-update-p4-and-lfs:
  travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build