[asterisk-commits] rmudgett: trunk r350735 - in /trunk: ./ configs/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jan 13 15:52:44 2012
New Revision: 350735

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350735
Log:
Correct eventtype names in cel_odbc and cel_pgsql sample files
........

Merged revisions 350733 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 350734 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/configs/cel_odbc.conf.sample
    trunk/configs/cel_pgsql.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/configs/cel_odbc.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/cel_odbc.conf.sample?view=diff&rev=350735&r1=350734&r2=350735
==============================================================================
--- trunk/configs/cel_odbc.conf.sample (original)
+++ trunk/configs/cel_odbc.conf.sample Fri Jan 13 15:52:44 2012
@@ -19,32 +19,32 @@
 ; table names, you will get duplicate records in that table.  So be careful.
 ;
 ; CEL FIELDS:
-;  	eventtype
-;	  CEL_CHANNEL_START = 1
-;	  CEL_CHANNEL_END = 2
-;	  CEL_HANGUP = 3
-;	  CEL_ANSWER = 4
-;	  CEL_APP_START = 5
-;	  CEL_APP_END = 6
-;	  CEL_BRIDGE_START = 7
-;	  CEL_BRIDGE_END = 8
-;	  CEL_CONF_START = 9
-;	  CEL_CONF_END = 10
-;	  CEL_PARK_START = 11
-;	  CEL_PARK_END = 12
-;	  CEL_BLINDTRANSFER = 13
-;	  CEL_ATTENDEDTRANSFER = 14
-;	  CEL_TRANSFER = 15
-;	  CEL_HOOKFLASH = 16
-;	  CEL_3WAY_START = 17
-;	  CEL_3WAY_END = 18
-;	  CEL_CONF_ENTER = 19
-;	  CEL_CONF_EXIT = 20
-;	  CEL_USER_DEFINED = 21
-;	  CEL_LINKEDID_END = 22
-;	  CEL_BRIDGE_UPDATE = 23
-;	  CEL_PICKUP = 24
-;	  CEL_FORWARD = 25
+;	eventtype
+;	  CHANNEL_START = 1
+;	  CHANNEL_END = 2
+;	  HANGUP = 3
+;	  ANSWER = 4
+;	  APP_START = 5
+;	  APP_END = 6
+;	  BRIDGE_START = 7
+;	  BRIDGE_END = 8
+;	  CONF_START = 9
+;	  CONF_END = 10
+;	  PARK_START = 11
+;	  PARK_END = 12
+;	  BLINDTRANSFER = 13
+;	  ATTENDEDTRANSFER = 14
+;	  TRANSFER = 15
+;	  HOOKFLASH = 16
+;	  3WAY_START = 17
+;	  3WAY_END = 18
+;	  CONF_ENTER = 19
+;	  CONF_EXIT = 20
+;	  USER_DEFINED = 21
+;	  LINKEDID_END = 22
+;	  BRIDGE_UPDATE = 23
+;	  PICKUP = 24
+;	  FORWARD = 25
 ;	eventtime  (timeval, includes microseconds)
 ;	userdeftype (set only if eventtype == USER_DEFINED)
 ;	cid_name

Modified: trunk/configs/cel_pgsql.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/cel_pgsql.conf.sample?view=diff&rev=350735&r1=350734&r2=350735
==============================================================================
--- trunk/configs/cel_pgsql.conf.sample (original)
+++ trunk/configs/cel_pgsql.conf.sample Fri Jan 13 15:52:44 2012
@@ -6,32 +6,32 @@
 ;
 ; CEL field names:
 ;
-;  	eventtype
-;	  CEL_CHANNEL_START = 1
-;	  CEL_CHANNEL_END = 2
-;	  CEL_HANGUP = 3
-;	  CEL_ANSWER = 4
-;	  CEL_APP_START = 5
-;	  CEL_APP_END = 6
-;	  CEL_BRIDGE_START = 7
-;	  CEL_BRIDGE_END = 8
-;	  CEL_CONF_START = 9
-;	  CEL_CONF_END = 10
-;	  CEL_PARK_START = 11
-;	  CEL_PARK_END = 12
-;	  CEL_BLINDTRANSFER = 13
-;	  CEL_ATTENDEDTRANSFER = 14
-;	  CEL_TRANSFER = 15
-;	  CEL_HOOKFLASH = 16
-;	  CEL_3WAY_START = 17
-;	  CEL_3WAY_END = 18
-;	  CEL_CONF_ENTER = 19
-;	  CEL_CONF_EXIT = 20
-;	  CEL_USER_DEFINED = 21
-;	  CEL_LINKEDID_END = 22
-;	  CEL_BRIDGE_UPDATE = 23
-;	  CEL_PICKUP = 24
-;	  CEL_FORWARD = 25
+;	eventtype
+;	  CHANNEL_START = 1
+;	  CHANNEL_END = 2
+;	  HANGUP = 3
+;	  ANSWER = 4
+;	  APP_START = 5
+;	  APP_END = 6
+;	  BRIDGE_START = 7
+;	  BRIDGE_END = 8
+;	  CONF_START = 9
+;	  CONF_END = 10
+;	  PARK_START = 11
+;	  PARK_END = 12
+;	  BLINDTRANSFER = 13
+;	  ATTENDEDTRANSFER = 14
+;	  TRANSFER = 15
+;	  HOOKFLASH = 16
+;	  3WAY_START = 17
+;	  3WAY_END = 18
+;	  CONF_ENTER = 19
+;	  CONF_EXIT = 20
+;	  USER_DEFINED = 21
+;	  LINKEDID_END = 22
+;	  BRIDGE_UPDATE = 23
+;	  PICKUP = 24
+;	  FORWARD = 25
 ;	eventtime  (timeval, includes microseconds)
 ;	userdeftype (set only if eventtype == USER_DEFINED)
 ;	cid_name