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 41012622295df3b6a7b024b0ddd5826087c29b67 (commit)
via b56dbddec26af37aac066b40abdb3551e26ec71b (commit)
via dd7cd13b557edca6c30618b3fc112a9e1f237c68 (commit)
via f099a71adf5bf80090a83169c677f8a5a62a574f (commit)
via 25f525c4ed089d46ca1cf21cc0c047fe8504180c (commit)
via 2ce59a1cc88d948d941e2b78b287c10a3ea3d011 (commit)
via ca9653aa7f3b0f60232c1a776e2f581c1d9fd68b (commit)
via 830436d4301db8b1608bc6b10d96ab1f3bf7bab4 (commit)
via 243d9b22e9935b8296b03731bb2fa72ed4c5286c (commit)
via ae0d526607ab639a2cb97567da89d7df87c26595 (commit)
via 2b7e260ab294ef7f0cd3cf9dc3bb34db731d6d6c (commit)
via 05004c9505fa80af1b3dfbc9121c1f200d41495e (commit)
via 9e0b1bc0e75e872fef1cf83019a1a052b2f91a63 (commit)
via 3a7eadc8f8255d2dfe087547f587cfd3122dd28e (commit)
via e33c38bcd1ef43de9b2addea1ea5dfb62b03efb4 (commit)
via f3007d5b5b9bc1cf7ad1a7be545d680d4be53c18 (commit)
via ef40cba8c01617ea7989706856f2934459f8c2f1 (commit)
from bd56900aba47b92c6212834453fcefd3e82a0d94 (commit)
Summary of changes:
snap-server.cabal | 11 +-
src/Snap/Http/Server.hs | 120 +++++++++--
src/Snap/Http/Server/Config.hs | 471 +++++++++++++++++++++++++++++++---------
3 files changed, 474 insertions(+), 128 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 41012622295df3b6a7b024b0ddd5826087c29b67
Merge: bd56900 b56dbdd
Author: Gregory Collins <[email protected]>
Date: Sun Oct 10 21:51:04 2010 +0200
Merge branch '0.3'
Conflicts:
snap-server.cabal
diff --cc snap-server.cabal
index ea82c13,f0216ff..ac77bfe
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@@ -1,5 -1,5 +1,5 @@@
name: snap-server
- version: 0.2.14
-version: 0.3
++version: 0.3.0
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 -121,8 +123,12 @@@ Librar
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
++<<<<<<< HEAD
+ snap-core == 0.2.14,
++=======
+ snap-core >= 0.3 && <0.4,
+ snap-core >= 0.2.12 && <0.3,
++>>>>>>> b56dbddec26af37aac066b40abdb3551e26ec71b
template-haskell,
time,
transformers,
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
