From 6a1c998785bf763d16c11e261deea4a2d83e0f78 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 5 Jan 2015 15:38:26 +0100 Subject: [PATCH 1/3] travis-ci: build only supported branches. Send email notifications on failure only (cherry picked from commit dc9928ec99901ec713d1a79b02a8554ed5f6618e) --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5b76b01a76..b7b4352d517 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,16 @@ 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@lists.sip-router.org From 4f6e524633924320c6bcc018611e90883191d00f Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 5 Jan 2015 19:07:08 +0100 Subject: [PATCH 2/3] travis-ci: set proper email notification options (cherry picked from commit 04999c90b074bf1571036ab88bb0a384a58f97a2) --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b7b4352d517..ecd40fd2ba0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,7 @@ notifications: on_success: never on_failure: always email: - - sr-dev@lists.sip-router.org + recipients: + - sr-dev@lists.sip-router.org + on_success: never + on_failure: always From d2bd1e573c72a24cd9e6382cdfd96a79b139f31d Mon Sep 17 00:00:00 2001 From: Luis Azedo Date: Tue, 6 Jan 2015 00:03:08 +0000 Subject: [PATCH 3/3] kazoo : missing operator (cherry picked from commit fd3520acd7ab75890a0f514dfb349d94c2ce2807) --- modules/kazoo/kz_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/kazoo/kz_json.c b/modules/kazoo/kz_json.c index 9c538b7211f..07084bb64c6 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) {