[asterisk-dev] [asterisk-commits] lathama: branch 1.8 r305987 - in /branches/1.8: ./ configs/ phoneprov/

[Russell Bryant]

I see that the property is being updated to reflect that this is a merge from 1.6.2, but you do not appear to be using the commit message generated by svnmerge.  Please do so for consistency.  Take a look at other merge commits to see what I'm talking about.

--
Russell Bryant
Digium, Inc.  |  Engineering Manager, Open Source Software
445 Jan Davis Drive NW   -    Huntsville, AL 35806  -  USA
jabber: rbryant at digium.com    -=-    skype: russell-bryant
www.digium.com -=- www.asterisk.org -=- blogs.asterisk.org


----- Original Message -----
> Author: lathama
> Date: Thu Feb 3 09:50:35 2011
> New Revision: 305987
> 
> URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305987
> Log:
> res_phoneprov add snom 300, 320, 360, 370, 820, 821, 870 support
> 
> (issue #18713)
> Reported by: lathama
> Patches:
> snom_dir.diff uploaded by lathama (license 1028)
> Tested by: lathama
> 
> Added:
> branches/1.8/phoneprov/snom-mac.xml
> - copied unchanged from r305985, branches/1.6.2/phoneprov/snom-mac.xml
> Modified:
> branches/1.8/ (props changed)
> branches/1.8/configs/phoneprov.conf.sample
> 
> Propchange: branches/1.8/
> ------------------------------------------------------------------------------
> Binary property 'branch-1.6.2-merged' - no diff available.
> 
> Modified: branches/1.8/configs/phoneprov.conf.sample
> URL:
> http://svnview.digium.com/svn/asterisk/branches/1.8/configs/phoneprov.conf.sample?view=diff&rev=305987&r1=305986&r2=305987
> ==============================================================================
> --- branches/1.8/configs/phoneprov.conf.sample (original)
> +++ branches/1.8/configs/phoneprov.conf.sample Thu Feb 3 09:50:35 2011
> @@ -131,3 +131,6 @@
> config/${MAC} => polycom.xml ; Dynamic Filename => template file
> ${MAC}-directory.xml => 000000000000-directory.xml
> setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
> ; Custom variable
> +
> +;snom 300, 320, 360, 370, 820, 821, 870 support
> +snom-${MAC}.xml => snom-mac.xml
> 
> 
> --
> _____________________________________________________________________
> -- Bandwidth and Colocation Provided by http://www.api-digital.com --
> 
> asterisk-commits mailing list
> To UNSUBSCRIBE or update options visit:
> http://lists.digium.com/mailman/listinfo/asterisk-commits