Module: kamailio Branch: master Commit: 3ee47957201cb5cc2824a82a94832a526aba0ccb URL: https://github.com/kamailio/kamailio/commit/3ee47957201cb5cc2824a82a94832a52...
Author: Luis Azedo luis@2600hz.com Committer: Luis Azedo luis@2600hz.com Date: 2015-02-05T19:35:48Z
Merge branch 'master' of https://github.com/kamailio/kamailio
# By Jason Penton # Via Jason Penton * 'master' of https://github.com/kamailio/kamailio: modules/cdp: changed stats to use internal counters instead
---
Modified: modules/dialog_ng/dlg_handlers.c
---
Diff: https://github.com/kamailio/kamailio/commit/3ee47957201cb5cc2824a82a94832a52... Patch: https://github.com/kamailio/kamailio/commit/3ee47957201cb5cc2824a82a94832a52...
---
diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index ff39104..01d3cd4 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -557,7 +557,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { }
counter_add(dialog_ng_cnts_h.early, -1); - counter_inc(dialog_ng_counters_h.active); + counter_inc(dialog_ng_cnts_h.active); run_dlg_callbacks(DLGCB_CONFIRMED, dlg, req, rpl, DLG_DIR_UPSTREAM, 0);
if (unref) unref_dlg(dlg, unref);
On 02/05/2015 08:36 PM, Luis Azedo wrote:
Merge branch 'master' of https://github.com/kamailio/kamailio
Please Luis, before push do a git rebase. We're trying to avoid this kind of things in the git history.
On 05 Feb 2015, at 21:11, Victor Seva linuxmaniac@torreviejawireless.org wrote:
On 02/05/2015 08:36 PM, Luis Azedo wrote:
Merge branch 'master' of https://github.com/kamailio/kamailio
Please Luis, before push do a git rebase. We're trying to avoid this kind of things in the git history.
I had a hard time learning this too. Finally made this script:
$ cat /usr/local/bin/gitpull #!/bin/sh git pull --ff --rebase origin
/O
sure, sorry about this.
________________________________________ From: sr-dev [sr-dev-bounces@lists.sip-router.org] on behalf of Victor Seva [linuxmaniac@torreviejawireless.org] Sent: Thursday, February 05, 2015 12:11 PM To: sr-dev@lists.sip-router.org Subject: Re: [sr-dev] git:master:3ee47957: Merge branch 'master' of https://github.com/kamailio/kamailio
On 02/05/2015 08:36 PM, Luis Azedo wrote:
Merge branch 'master' of https://github.com/kamailio/kamailio
Please Luis, before push do a git rebase. We're trying to avoid this kind of things in the git history.
-
Luis Azedo -
Olle E. Johansson -
Victor Seva