~phatforge/freeswitch/+git/master:bugfix/FS-8865-mod-format-json-locking

Last commit made on 2016-05-11
Get this branch:
git clone -b bugfix/FS-8865-mod-format-json-locking https://git.launchpad.net/~phatforge/freeswitch/+git/master

Branch merges

Branch information

Name:
bugfix/FS-8865-mod-format-json-locking
Repository:
lp:~phatforge/freeswitch/+git/master

Recent commits

62fe1bf... by "nneul at mst.edu" <email address hidden>

FS-8865: [mod_format_json] improve locking race, but potential still exists

3a1dc22... by "nneul at mst.edu" <email address hidden>

Merge remote-tracking branch 'origin/master' into bugfix/FS-8865-mod-format-json-locking

ce1b7c5... by Seven Du <email address hidden>

FS-9151 #resolve

3fca86c... by Travis Cross <email address hidden>

Remove superfluous semicolon

Having this extra semicolon here confuses automatic indentation.

9dbe81b... by Travis Cross <email address hidden>

Cleanup inconsistent whitespace in debian/util.sh

We use two space indentation in this file and no tabs as per the
mode-line header.

dad2cd1... by Mike Jerris <email address hidden>

Merge pull request #841 in FS/freeswitch from ~ICEHESS/freeswitch:feature/FS-9132-add-more-variables-to-default-filter to master

* commit '8153b6fdeef9785dc044de7068cab38ee1ea9e5d':
  FS-9132: [mod_kazoo] remove whitespaces
  FS-9132: [mod_kazoo] Add more vars to default filter

8153b6f... by Hesaam Farhang <hesaam@2600hz.com>

FS-9132: [mod_kazoo] remove whitespaces

b5169e7... by Hesaam Farhang <hesaam@2600hz.com>

FS-9132: [mod_kazoo] Add more vars to default filter

03b4de5... by William King

Merge pull request #844 in FS/freeswitch from ~LEKENSTEYN/freeswitch:bugfix/FS-7783-bad-var-name to master

* commit '69d643b53f5c72a33728a73b9fbf0b0ecc41b7e6':
  Properly handle NULL var_name for switch_play_and_get_digits

69d643b... by Peter Wu

Properly handle NULL var_name for switch_play_and_get_digits

Do not set "_invalid" in case var_name is empty or unset. While at it,
clear the "foo_invalid" variable before doing anything else when a regex
is passed, this ensures that the variable really reflects the current
run.

Fixes an issue in original FS-7783 feature.