features_config: Ignore parkinglots in features.conf instead of failing to load
authorJonathan Rose <jrose@digium.com>
Fri, 30 Aug 2013 18:30:01 +0000 (18:30 +0000)
committerJonathan Rose <jrose@digium.com>
Fri, 30 Aug 2013 18:30:01 +0000 (18:30 +0000)
commit0dfe658a5c9951b3dd1469eb17345d568ce3767b
treec98601cbc75494048622f44393ed9df675881518
parentdcaa0cf659550a1ef73216adb066fbd50b7295a7
features_config: Ignore parkinglots in features.conf instead of failing to load

Parkinglots are defined in res_features.conf now, but this patch fixes
features_config so that features don't fail to load when parkinglots
are present in features.conf

Review: https://reviewboard.asterisk.org/r/2801/
........

Merged revisions 398068 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/config_options.c
main/features_config.c