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, master has been updated
via 7a122e4cb3c2a09a06764c4bb9ec9d6329dc125c (commit)
via c1edb516e1c4f9a90bfb6f8b16a1d89416eb1721 (commit)
via 077eef44d017b7afd83acc1812d1a280d77a992b (commit)
via 57b0f80fffce025dfbd98ee7d514a77fcd1c439f (commit)
via d0e48d9ff63accab80c168b63e3ae7fd99d555bc (commit)
via cf121f0e01fe45b8f3718b64a414c9e54d86793e (commit)
from 7ee15e59949f568f8a9b7b9359c7667b7016b80b (commit)
Summary of changes:
snap-server.cabal | 2 +-
test/snap-server-testsuite.cabal | 6 +++---
2 files changed, 4 insertions(+), 4 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 7a122e4cb3c2a09a06764c4bb9ec9d6329dc125c
Merge: 7ee15e5 c1edb51
Author: Gregory Collins <[email protected]>
Date: Mon Oct 25 17:26:12 2010 +0200
Merge branch '0.2-stable'
Conflicts:
snap-server.cabal
test/snap-server-testsuite.cabal
diff --cc snap-server.cabal
index 35296b7,6774d7f..f8c099d
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@@ -127,9 -126,8 +127,9 @@@ Librar
template-haskell,
time,
transformers,
- unix-compat,
+ utf8-string,
+ unix-compat == 0.2.*,
- vector >= 0.6 && <0.7
+ vector >= 0.7 && <0.8
if flag(portable) || os(windows)
cpp-options: -DPORTABLE
diff --cc test/snap-server-testsuite.cabal
index e300814,70862ea..f326325
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@@ -47,8 -47,7 +47,8 @@@ Executable testsuit
test-framework-quickcheck2 >= 0.2.6 && < 0.3,
time,
transformers,
+ utf8-string >= 0.3.6 && <0.4,
- vector >= 0.6.0.1 && < 0.7
+ vector >= 0.7 && <0.8
if !os(windows)
build-depends: unix
@@@ -103,9 -102,8 +103,9 @@@ Executable pongserve
template-haskell,
time,
transformers,
- unix-compat,
+ unix-compat == 0.2.*,
+ utf8-string >= 0.3.6 && <0.4,
- vector >= 0.6.0.1 && < 0.7
+ vector >= 0.7 && <0.8
if flag(portable) || os(windows)
cpp-options: -DPORTABLE
@@@ -184,8 -182,7 +184,8 @@@ Executable testserve
test-framework-quickcheck2 >= 0.2.6 && < 0.3,
time,
transformers,
+ utf8-string >= 0.3.6 && <0.4,
- vector >= 0.6.0.1 && < 0.7
+ vector >= 0.7 && <0.8
if !os(windows)
build-depends: unix
commit c1edb516e1c4f9a90bfb6f8b16a1d89416eb1721
Author: Gregory Collins <[email protected]>
Date: Mon Oct 25 17:24:44 2010 +0200
Bump 0.2-stable version
diff --git a/snap-server.cabal b/snap-server.cabal
index e05b7c8..6774d7f 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.14.1
+version: 0.2.15
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
@@ -122,7 +122,7 @@ Library
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
- snap-core == 0.2.14,
+ snap-core == 0.2.15,
template-haskell,
time,
transformers,
commit 077eef44d017b7afd83acc1812d1a280d77a992b
Author: Gregory Collins <[email protected]>
Date: Mon Oct 25 17:24:22 2010 +0200
Bump vector dependency
diff --git a/snap-server.cabal b/snap-server.cabal
index 76340da..e05b7c8 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.15
+version: 0.2.14.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
@@ -122,12 +122,12 @@ Library
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
- snap-core == 0.2.15,
+ snap-core == 0.2.14,
template-haskell,
time,
transformers,
unix-compat,
- vector >= 0.6 && <0.7
+ vector >= 0.7 && <0.8
if flag(portable) || os(windows)
cpp-options: -DPORTABLE
diff --git a/test/snap-server-testsuite.cabal b/test/snap-server-testsuite.cabal
index e53088b..70862ea 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -47,7 +47,7 @@ Executable testsuite
test-framework-quickcheck2 >= 0.2.6 && < 0.3,
time,
transformers,
- vector >= 0.6.0.1 && < 0.7
+ vector >= 0.7 && <0.8
if !os(windows)
build-depends: unix
@@ -103,7 +103,7 @@ Executable pongserver
time,
transformers,
unix-compat,
- vector >= 0.6.0.1 && < 0.7
+ vector >= 0.7 && <0.8
if flag(portable) || os(windows)
cpp-options: -DPORTABLE
@@ -182,7 +182,7 @@ Executable testserver
test-framework-quickcheck2 >= 0.2.6 && < 0.3,
time,
transformers,
- vector >= 0.6.0.1 && < 0.7
+ vector >= 0.7 && <0.8
if !os(windows)
build-depends: unix
commit 57b0f80fffce025dfbd98ee7d514a77fcd1c439f
Author: Gregory Collins <[email protected]>
Date: Mon Oct 25 15:23:52 2010 +0200
Bump 0.2-stable version
diff --git a/snap-server.cabal b/snap-server.cabal
index ea82c13..76340da 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.14
+version: 0.2.15
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
@@ -122,7 +122,7 @@ Library
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
- snap-core == 0.2.14,
+ snap-core == 0.2.15,
template-haskell,
time,
transformers,
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
