[commit: ghc] wip/nfs-locking: Merge branch 'master' of https://github.com/snowleopard/hadrian (8586ab8)

[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/8586ab84fbac7e250d23844bbd39c147f87ce092/ghc

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

commit 8586ab84fbac7e250d23844bbd39c147f87ce092
Merge: 4b6707a 942ed27
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Aug 19 03:45:40 2017 +0100

    Merge branch 'master' of https://github.com/snowleopard/hadrian



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

8586ab84fbac7e250d23844bbd39c147f87ce092
 src/Hadrian/Oracles/DirectoryContents.hs | 10 +++++++++-
 src/Rules/Install.hs                     |  8 +++++---
 2 files changed, 14 insertions(+), 4 deletions(-)