[commit: ghc] wip/nfs-locking: Merge pull request #112 from angerman/feature/osx-ci (6095058)

[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/609505834ca4a9178b8263b00208ec651318c8c1/ghc

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

commit 609505834ca4a9178b8263b00208ec651318c8c1
Merge: 2f52d19 12c433c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 6 10:56:48 2016 +0000

    Merge pull request #112 from angerman/feature/osx-ci
    
    Adds osx to the list of operatin systems in the travis.yml



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

609505834ca4a9178b8263b00208ec651318c8c1
 .travis.yml | 55 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 26 deletions(-)