Merge branch 'ls/travis-update-p4-and-lfs' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:24 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:24 +0000 (14:49 -0800)
commitd27381eeeb451fd3e2072a069c19dcc900e8ae3d
tree07f0e9da8b4e9e08109ac99603cba107a228e226
parenta274e0a036ea886a31f8b216564ab1b4a3142f6c
parent5f703e8f023f080972e9ed1413ffb98031af4da2
Merge branch 'ls/travis-update-p4-and-lfs' into maint

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