[asterisk-commits] lmadsen: branch 1.6.1 r167376 - in /branches/1.6.1: ./ contrib/scripts/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Jan  7 08:41:14 2009
New Revision: 167376

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167376
Log:
Merged revisions 167373 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167373 | lmadsen | 2009-01-07 09:26:19 -0500 (Wed, 07 Jan 2009) | 1 line
  
  Update the sip-friends.sql file to use the non-deprecated 'defaultname' instead of 'username' and remove an extra comma that would cause the script to fail as-is
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/contrib/scripts/sip-friends.sql

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

Modified: branches/1.6.1/contrib/scripts/sip-friends.sql
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/contrib/scripts/sip-friends.sql?view=diff&rev=167376&r1=167375&r2=167376
==============================================================================
--- branches/1.6.1/contrib/scripts/sip-friends.sql (original)
+++ branches/1.6.1/contrib/scripts/sip-friends.sql Wed Jan  7 08:41:14 2009
@@ -5,7 +5,7 @@
 CREATE TABLE `sipfriends` (
   `name` varchar(40) NOT NULL default '',
   `type` varchar(10) NOT NULL default '',
-  `username` varchar(40),
+  `defaultname` varchar(40),
   `fromuser` varchar(40),
   `fromdomain` varchar(40),
   `secret` varchar(40),
@@ -50,5 +50,5 @@
   `setvar` varchar(200),
   PRIMARY KEY  (`name`),
   INDEX host (host, port),
-  INDEX ipaddr (ipaddr, port),
+  INDEX ipaddr (ipaddr, port)
 ) TYPE=MyISAM;