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.3 has been updated
via b56dbddec26af37aac066b40abdb3551e26ec71b (commit)
via e59d013ffc19d300cee6270b834ce60225213663 (commit)
via c952d515f8fb6a3c36d6f63c959ec42b39db1c44 (commit)
via 42eaad53471679ec8e573b9da4cf66932db0fe20 (commit)
via 6468aa23cfda9534ddc55a91e94dac1c6157e7a7 (commit)
via b3cd13f6b91e80d99d44509f51288be3fa67617d (commit)
via bcbff76cbbc7d801ed92a4638ca6daa01fe021d6 (commit)
via 13ad447b7fd872fe853b80ef7e83b2c84bc93d09 (commit)
via 0633385960a8c30a034b3acba3e43037d896f8bf (commit)
via 28f2c72873f159507317a1c0d3a3cc846101cfcf (commit)
via 9cb10b8cfb65e0f0c3316d65cdd1022f178c2df1 (commit)
via c4186d7352f394893307e7712783d9c5df413b14 (commit)
via d4adf2f5048f198873648ca0e3ce9bf05caff464 (commit)
via b71b0cdac729bfc5fb8b3fc3463c371590437a93 (commit)
via e1147316ed9789e4a47e6d6526fecd440919a346 (commit)
via ace8a2cce65115ee112249f5b59979e4ee9c5ca8 (commit)
via 7f9e8149b0922008ea38568d2da432ffd3505ab0 (commit)
via 15ddc120851c67cb01b486ca52af16a8ee0fe512 (commit)
via 07cd4e0216c56bd98e15a55f5c0c926e991cc370 (commit)
via 90b0af02399d1bcd9cf78dc77c3711dbb7c35140 (commit)
via 3fa60d0aa38462a902708ffe43b49144792b2068 (commit)
via 4d9a3df2066fa66e4d3079e8215f6c9ade04f2e7 (commit)
via 21f2ea5bd9970997fadc1a943ed10fa999981076 (commit)
via b387fc5affd788791ea0368ff205df162f4c8821 (commit)
via 228ff1e61df40d7300233ce2de9b887a4ad5bbff (commit)
via da585b22fe04a0f516d4b73ca073f73421290385 (commit)
from dd7cd13b557edca6c30618b3fc112a9e1f237c68 (commit)
Summary of changes:
snap-server.cabal | 17 ++-
.../Concurrent.hs => Concurrent/HashMap.hs} | 48 ++++----
src/Data/Concurrent/HashMap/Internal.hs | 16 +++
src/Snap/Internal/Http/Server.hs | 46 +++++++-
src/Snap/Internal/Http/Server/Date.hs | 64 +++++++----
src/Snap/Internal/Http/Server/LibevBackend.hs | 6 +-
test/runTestsAndCoverage.sh | 3 +
test/snap-server-testsuite.cabal | 19 ++--
test/suite/Data/Concurrent/HashMap/Tests.hs | 121 ++++++++++++++++++++
test/suite/Data/HashMap/Concurrent/Tests.hs | 31 -----
test/suite/Snap/Internal/Http/Server/Tests.hs | 58 +++++++++-
test/suite/TestSuite.hs | 6 +-
12 files changed, 330 insertions(+), 105 deletions(-)
rename src/Data/{HashMap/Concurrent.hs => Concurrent/HashMap.hs} (83%)
create mode 100644 src/Data/Concurrent/HashMap/Internal.hs
create mode 100644 test/suite/Data/Concurrent/HashMap/Tests.hs
delete mode 100644 test/suite/Data/HashMap/Concurrent/Tests.hs
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 b56dbddec26af37aac066b40abdb3551e26ec71b
Merge: dd7cd13 e59d013
Author: Gregory Collins <[email protected]>
Date: Tue Aug 31 14:45:55 2010 -0400
Merge branch 'master' into 0.3
Conflicts:
snap-server.cabal
diff --cc snap-server.cabal
index 6d4ea05,404532e..f0216ff
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@@ -93,10 -95,11 +95,11 @@@ Librar
System.FastLogger
other-modules:
- Data.HashMap.Concurrent,
+ Data.Concurrent.HashMap,
+ Data.Concurrent.HashMap.Internal,
Paths_snap_server,
Snap.Internal.Http.Parser,
- Snap.Internal.Http.Server,
+ Snap.Internal.Http.Server,
Snap.Internal.Http.Server.Date
build-depends:
@@@ -118,10 -120,10 +121,12 @@@
murmur-hash >= 0.1 && < 0.2,
network == 2.2.1.*,
old-locale,
+ snap-core >= 0.3 && <0.4,
+ snap-core >= 0.2.12 && <0.3,
+ template-haskell,
time,
transformers,
+ utf8-string,
unix-compat,
vector >= 0.6 && <0.7
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
