Merge branch 'master' into snap-server

This commit is contained in:
Mihai Maruseac 2017-08-11 09:35:58 -07:00 committed by GitHub
commit 8314a00ce4

View File

@ -961,7 +961,7 @@ packages:
# - wai-middleware-caching-redis # GHC 8.2.1 via hedis # - wai-middleware-caching-redis # GHC 8.2.1 via hedis
# not package maintainer # not package maintainer
- ekg - ekg
# - ekg-json # GHC 8.2.1 - ekg-json
"Paul Rouse <pgr@doynton.org> @paul-rouse": "Paul Rouse <pgr@doynton.org> @paul-rouse":
- mysql - mysql
@ -1299,7 +1299,7 @@ packages:
# - waitra # GHC 8.2.1 # - waitra # GHC 8.2.1
# scrive/log # scrive/log
# - log # via bloodhound: bounds: vector # - log # via bloodhound: bounds: vector # GHC 8.2.1
- log-base - log-base
# - log-elasticsearch # via bloodhound: bounds: vector # GHC 8.2.1 # - log-elasticsearch # via bloodhound: bounds: vector # GHC 8.2.1
- log-postgres - log-postgres
@ -1613,7 +1613,7 @@ packages:
- autoexporter - autoexporter
- bento - bento
- bmp # Maintained by @benl23x5. - bmp # Maintained by @benl23x5.
# - ekg-statsd # Maintained by @tibbe. # GHC 8.2.1 - ekg-statsd
- flow - flow
- github-release - github-release
# - gloss # Maintained by @benl23x5. # GHC 8.2.1 # - gloss # Maintained by @benl23x5. # GHC 8.2.1
@ -1871,7 +1871,7 @@ packages:
- protocol-buffers - protocol-buffers
# - hprotoc # build failure https://github.com/k-bx/protocol-buffers/issues/45 # - hprotoc # build failure https://github.com/k-bx/protocol-buffers/issues/45
- protocol-buffers-descriptor - protocol-buffers-descriptor
# - ekg-core # GHC 8.2.1 - ekg-core
- digits - digits
- hbeanstalk - hbeanstalk
- iso3166-country-codes - iso3166-country-codes
@ -2028,7 +2028,7 @@ packages:
# - misfortune # via random-fu: via log-domain: via safecopy: bounds: vector # - misfortune # via random-fu: via log-domain: via safecopy: bounds: vector
"Timo von Holtz <tvh@tvholtz.de> @tvh": "Timo von Holtz <tvh@tvholtz.de> @tvh":
# - ekg-wai # GHC 8.2.1 # ekg-wai
- haxl-amazonka - haxl-amazonka
# - hasql-migration # https://github.com/nikita-volkov/hasql/issues/76 # - hasql-migration # https://github.com/nikita-volkov/hasql/issues/76
# - servant-JuicyPixels # GHC 8.2.1 # - servant-JuicyPixels # GHC 8.2.1