[svn-commits] mmichelson: branch mmichelson/digit_manipulation r198631 - in /team/mmichelso...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Jun  1 13:46:35 2009
New Revision: 198631

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198631
Log:
Get in sync with trunk.


Modified:
    team/mmichelson/digit_manipulation/   (props changed)
    team/mmichelson/digit_manipulation/contrib/scripts/meetme.sql

Propchange: team/mmichelson/digit_manipulation/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun  1 13:46:35 2009
@@ -1,1 +1,1 @@
-/trunk:1-198611
+/trunk:1-198629

Modified: team/mmichelson/digit_manipulation/contrib/scripts/meetme.sql
URL: http://svn.asterisk.org/svn-view/asterisk/team/mmichelson/digit_manipulation/contrib/scripts/meetme.sql?view=diff&rev=198631&r1=198630&r2=198631
==============================================================================
--- team/mmichelson/digit_manipulation/contrib/scripts/meetme.sql (original)
+++ team/mmichelson/digit_manipulation/contrib/scripts/meetme.sql Mon Jun  1 13:46:35 2009
@@ -4,9 +4,17 @@
 
 CREATE TABLE meetme (
 	confno char(80) DEFAULT '0' NOT NULL,
+	-- Must set schedule=yes in meetme.conf to use starttime and endtime
+	starttime datetime NULL,
+	endtime datetime NULL,
+	-- PIN to enter the conference, if any
 	pin char(20) NULL,
+	-- PIN to enter the conference as an administrator, if any
 	adminpin char(20) NULL,
+	-- Current count of conference participants
 	members integer DEFAULT 0 NOT NULL,
-	PRIMARY KEY (confno)
+	-- Maximum conference participants allowed concurrently
+	maxusers integer DEFAULT 0 NOT NULL,
+	PRIMARY KEY (confno, starttime)
 );