From: Mike Jerris Date: Fri, 20 Feb 2015 17:23:09 +0000 (-0600) Subject: Merge pull request #181 in FS/freeswitch from ~CXREG/freeswitch-memcache-file:base_al... X-Git-Tag: v1.4.17~1^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a9fc69a04ffa77dcd657c3a8fb4390b044947e;p=thirdparty%2Ffreeswitch.git Merge pull request #181 in FS/freeswitch from ~CXREG/freeswitch-memcache-file:base_alt_dir to master * commit 'ded03004a21a317783b06c6141430007641af7c6': FS-7284 allow -base to satisfy "You must specify all or none of -conf, -log, and -db" --- a3a9fc69a04ffa77dcd657c3a8fb4390b044947e