[asterisk-commits] tilghman: branch 1.6.0 r206585 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul 14 15:22:27 2009
New Revision: 206585

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206585
Log:
Recorded merge of revisions 206567 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r206567 | tilghman | 2009-07-14 15:14:45 -0500 (Tue, 14 Jul 2009) | 6 lines
  
  Document all meetme realtime fields, and in the process, make some field lengths more consistent.
  (closes issue #15493)
   Reported by: lasko
   Patches: 
         meetme.diff uploaded by lasko (license 833)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/meetme.sql

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/meetme.sql
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/contrib/scripts/meetme.sql?view=diff&rev=206585&r1=206584&r2=206585
==============================================================================
--- branches/1.6.0/contrib/scripts/meetme.sql (original)
+++ branches/1.6.0/contrib/scripts/meetme.sql Tue Jul 14 15:22:27 2009
@@ -9,8 +9,12 @@
 	endtime datetime NULL,
 	-- PIN to enter the conference, if any
 	pin char(20) NULL,
+	-- Options to associate with normal users of the conference
+	opts char(100) NULL,
 	-- PIN to enter the conference as an administrator, if any
 	adminpin char(20) NULL,
+	-- Options to associate with administrator users of the conference
+	adminopts char(100) NULL,
 	-- Current count of conference participants
 	members integer DEFAULT 0 NOT NULL,
 	-- Maximum conference participants allowed concurrently