aboutsummaryrefslogtreecommitdiffhomepage
path: root/conf
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-04-16 10:26:49 -0400
committerRalph Amissah <ralph@amissah.com>2010-04-16 10:26:49 -0400
commit6ae87fe996678bd9a6f1c2fc46af63d0740bf5a7 (patch)
tree22e7383ecf12e1f2ef1444fbf846b3832d539b8e /conf
parentdebian/changelog (2.0.5-1) (diff)
parentupdate: changelog, version (2.1.0) (version bump for sql db structural changes) (diff)
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'conf')
-rw-r--r--conf/sisu/v2/sisurc.yml1
-rw-r--r--conf/sisu/v2/version.yml6
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v2/sisurc.yml
index 7a3e32af..418cdfd1 100644
--- a/conf/sisu/v2/sisurc.yml
+++ b/conf/sisu/v2/sisurc.yml
@@ -83,6 +83,7 @@ default:
# port: '8081'
#% sql database info, postgresql and sqlite
#db:
+# share_source: false # boolean, default is false
# postgresql:
# port: # '[port (default is 5432)]'
# host: # '[if not localhost, provide host tcp/ip address or domain name]''
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 8fd9c471..509d9e45 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.0.5
-:date_stamp: 2010w13/3
-:date: "2010-03-31"
+:version: 2.1.0
+:date_stamp: 2010w15/5
+:date: "2010-04-16"
:project: SiSU