[commit: ghc] wip/nfs-locking: Merge pull request #101 from quchen/master (0d43a40)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/0d43a40a2b42a3332e41e7e096b2d0834dffeb53/ghc

>---------------------------------------------------------------

commit 0d43a40a2b42a3332e41e7e096b2d0834dffeb53
Merge: b18f0e3 d0ffc1f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 5 11:31:03 2016 +0000

    Merge pull request #101 from quchen/master
    
    Rework Travis CI script



>---------------------------------------------------------------

0d43a40a2b42a3332e41e7e096b2d0834dffeb53
 .travis.yml                         | 52 +++++++++++++++++++++++++++----------
 .travis/install-cabal-happy-alex.sh | 18 -------------
 .travis/install-ghc-shake.sh        | 19 --------------
 .travis/install-ghc.sh              | 12 ---------
 .travis/print-env.sh                |  9 -------
 .travis/run-ghc-shake.sh            |  9 -------
 build.cabal.sh                      |  3 ++-
 build.sh                            |  2 +-
 8 files changed, 42 insertions(+), 82 deletions(-)