From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 2 Oct 2008 17:52:42 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.94~2349^2~1
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=695d3dd2d22686c6a7e5a7151b8ffa59c2ce0690

Merge branch 'master' of git://factorcode.org/git/factor
---

695d3dd2d22686c6a7e5a7151b8ffa59c2ce0690
diff --cc basis/db/db.factor
index 5b159d0ea1,87bf21d261..5b159d0ea1
mode 100755,100644..100644
--- a/basis/db/db.factor
+++ b/basis/db/db.factor
diff --cc basis/db/postgresql/postgresql.factor
index 08df25c13a,28548d1260..08df25c13a
mode 100755,100644..100644
--- a/basis/db/postgresql/postgresql.factor
+++ b/basis/db/postgresql/postgresql.factor
diff --cc basis/db/sqlite/sqlite.factor
index dfe4fdf475,dfd9fab08c..dfe4fdf475
mode 100755,100644..100644
--- a/basis/db/sqlite/sqlite.factor
+++ b/basis/db/sqlite/sqlite.factor
diff --cc basis/db/tuples/tuples-tests.factor
index f5569a97cd,6114c7ebe1..f5569a97cd
mode 100755,100644..100644
--- a/basis/db/tuples/tuples-tests.factor
+++ b/basis/db/tuples/tuples-tests.factor
diff --cc basis/furnace/auth/providers/db/db-tests.factor
index 3bcd82a15d,fac5c23e4a..3bcd82a15d
mode 100755,100644..100644
--- a/basis/furnace/auth/providers/db/db-tests.factor
+++ b/basis/furnace/auth/providers/db/db-tests.factor
diff --cc basis/furnace/db/db.factor
index ed18e42a4f,b4a4386015..ed18e42a4f
mode 100755,100644..100644
--- a/basis/furnace/db/db.factor
+++ b/basis/furnace/db/db.factor
diff --cc basis/furnace/sessions/sessions-tests.factor
index 6bb3c1cd69,ff089a92b2..6bb3c1cd69
mode 100755,100644..100644
--- a/basis/furnace/sessions/sessions-tests.factor
+++ b/basis/furnace/sessions/sessions-tests.factor
diff --cc basis/http/http-tests.factor
index eb8ba34f9e,49ef03543e..608ba0c88f
mode 100755,100644..100644
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@@ -179,10 -179,10 +179,10 @@@ http.server.dispatchers db.tuples 
  
  : add-quit-action
      <action>
-         [ stop-server "Goodbye" "text/html" <content> ] >>display
+         [ stop-this-server "Goodbye" "text/html" <content> ] >>display
      "quit" add-responder ;
  
 -: test-db "test.db" temp-file sqlite-db ;
 +: test-db "test.db" temp-file <sqlite-db> ;
  
  [ test-db drop delete-file ] ignore-errors