Merge remote-tracking branch 'upstream/master'

I had a fix on my branch for a long time that for some reason I forgot to send upstream. Conflicts: persistent-mysql/persistent-mysql.cabal
meteficha · Aug 17, 2012 · c2e2ef7 · c2e2ef7
2 parents 2e91760 + 0d18b59
commit c2e2ef7
Show file tree

Hide file tree

Showing 49 changed files with 96,957 additions and 78,374 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ persistent-test/test/testdb.sqlite3
 *.o
 TAGS
 .virthualenv
+# hsenv does this
+dist_y
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "pool"]
 	path = pool
 	url = https://github.com/bos/pool.git
-[submodule "mongoDB-haskell"]
-	path = mongoDB-haskell
-	url = https://github.com/TonyGen/mongoDB-haskell.git
diff --git a/experimental/mysql/Database/Mysql.hs b/experimental/mysql/Database/Mysql.hs
diff --git a/experimental/mysql/Database/Persist/Mysql.hs b/experimental/mysql/Database/Persist/Mysql.hs
diff --git a/experimental/mysql/LICENSE b/experimental/mysql/LICENSE
diff --git a/experimental/mysql/persistent-mysql.cabal b/experimental/mysql/persistent-mysql.cabal
diff --git a/experimental/redis/Database/Persist/Redis.hs b/experimental/redis/Database/Persist/Redis.hs
diff --git a/experimental/redis/LICENSE b/experimental/redis/LICENSE