[sr-dev] git:lazedo/4.2:35b38f8f: Merge branch '4.2' into lazedo/4.2

Module: kamailio Branch: lazedo/4.2 Commit: 35b38f8f17d7dcb2f7a504a6ad72cb53a3df57d2 URL: https://github.com/kamailio/kamailio/commit/35b38f8f17d7dcb2f7a504a6ad72cb5… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-01-06T00:05:12Z Merge branch '4.2' into lazedo/4.2 * 4.2: kazoo : missing operator travis-ci: set proper email notification options travis-ci: build only supported branches. Send email notifications on failure only --- Modified: .travis.yml Modified: modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/35b38f8f17d7dcb2f7a504a6ad72cb5… Patch: https://github.com/kamailio/kamailio/commit/35b38f8f17d7dcb2f7a504a6ad72cb5… --- diff --git a/.travis.yml b/.travis.yml index d5b76b0..ecd40fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,19 @@ before_install: - sudo apt-get install -y gdebi-core - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR script: ./pkg/kamailio/deb/build_travis.sh +branches: + only: + - master + - 4.2 + - 4.1 notifications: irc: channels: - "chat.freenode.net#Kamailio" - on_success: change + on_success: never on_failure: always email: - - sr-dev(a)lists.sip-router.org + recipients: + - sr-dev(a)lists.sip-router.org + on_success: never + on_failure: always diff --git a/modules/kazoo/kz_json.c b/modules/kazoo/kz_json.c index 9c538b7..07084bb 100644 --- a/modules/kazoo/kz_json.c +++ b/modules/kazoo/kz_json.c @@ -30,7 +30,7 @@ #include "kz_json.h" -static str kz_pv_str_empty {"", 0}; +static str kz_pv_str_empty = {"", 0}; char** str_split(char* a_str, const char a_delim) {