Merge branch 'master' into ghc7.10
Conflicts:
build-constraints.yaml
commit99eec0a27073325fea3672cecf2e880c542358a9
authorMichael Snoyman <michael@snoyman.com>
dateSun 3 May 2015, 18:37 (11 years ago)
parent13ec2524d9c77c
build-constraints.yaml−3
@@ -1290,9 +1290,6 @@ expected-test-failures:
12901290 # https://github.com/ekmett/linear/issues/75 GHC 7.10
12911291 - linear
12921292
1293− # https://github.com/yesodweb/Shelly.hs/issues/99
1294− - shelly
1295−
12961293# Haddocks which are expected to fail. Same concept as expected test failures.
12971294expected-haddock-failures:
12981295 # https://github.com/acw/bytestring-progress/issues/4