This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, 0.2-stable has been updated
via 6417ac3a8af837337a99c861b88d96b5d2651d65 (commit)
via 73de4d174a75a844f4cfd08f60bbdebe8abf95dc (commit)
via ef62d58008999e1db974faf26a64f0832400bdf2 (commit)
via 033d48c24bd20f4c8a99c447d1be4d2d342b033f (commit)
from 677576955a708ed543d9d7c21d520cfceced3428 (commit)
Summary of changes:
snap-server.cabal | 2 +-
src/Snap/Internal/Http/Server.hs | 69 ++++++++++++++++++--------------------
test/snap-server-testsuite.cabal | 6 ++--
3 files changed, 37 insertions(+), 40 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6417ac3a8af837337a99c861b88d96b5d2651d65
Merge: 73de4d1 6775769
Author: Gregory Collins <[email protected]>
Date: Sun Nov 7 15:23:35 2010 +0100
Merge branch '0.2-stable' of git.snapframework.com:snap-server into
0.2-stable
commit 73de4d174a75a844f4cfd08f60bbdebe8abf95dc
Merge: 033d48c ef62d58
Author: Gregory Collins <[email protected]>
Date: Sun Nov 7 15:22:42 2010 +0100
Merge branch '0.2.15-fix' into 0.2-stable
commit ef62d58008999e1db974faf26a64f0832400bdf2
Author: Gregory Collins <[email protected]>
Date: Sun Nov 7 15:19:02 2010 +0100
Monads-fd dependency fix.
diff --git a/snap-server.cabal b/snap-server.cabal
index 07c9c25..89a31ba 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.15
+version: 0.2.15.1
synopsis: A fast, iteratee-based, epoll-enabled web server for the Snap
Framework
description:
This is the first developer prerelease of the Snap framework. Snap is a
@@ -118,11 +118,11 @@ Library
dlist >= 0.5 && < 0.6,
filepath,
iteratee >= 0.3.1 && <0.4,
- monads-fd,
+ monads-fd < 0.1.0.3,
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
- snap-core == 0.2.15,
+ snap-core == 0.2.15.1,
template-haskell,
time,
transformers,
diff --git a/test/snap-server-testsuite.cabal b/test/snap-server-testsuite.cabal
index 70862ea..3a46493 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -33,7 +33,7 @@ Executable testsuite
haskell98,
HTTP >= 4000.0.9 && < 4001,
HUnit >= 1.2 && < 2,
- monads-fd,
+ monads-fd < 0.1.0.3,
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.7,
network-bytestring >= 0.1.2 && < 0.2,
@@ -90,7 +90,7 @@ Executable pongserver
filepath,
haskell98,
HUnit >= 1.2 && < 2,
- monads-fd,
+ monads-fd < 0.1.0.3,
old-locale,
parallel > 2,
iteratee >= 0.3.1 && < 0.4,
@@ -168,7 +168,7 @@ Executable testserver
HTTP >= 4000.0.9 && < 4001,
HUnit >= 1.2 && < 2,
MonadCatchIO-transformers >= 0.2.1 && < 0.3,
- monads-fd,
+ monads-fd < 0.1.0.3,
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.7,
network-bytestring >= 0.1.2 && < 0.2,
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
