26 Feb
2009
26 Feb
'09
2:02 p.m.
Module: sip-router
Branch: master
Commit: 90bb3224cc75db8dbaab3c2c21c54dddad544b79
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90bb322…
Author: Jan Janak <jan(a)iptel.org>
Committer: Jan Janak <jan(a)iptel.org>
Date: Mon Feb 23 22:58:35 2009 +0100
Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router
* 'master' of ssh://janakj@git.sip-router.org/sip-router:
tcp: fix compilation problem on solaris (FIONREAD)
core: fix bad level name in new LOG()
t_check_status() checks also the blind UACs if t_pick_branch()
Documenting t_lookup_cancel() script function.
Removing set_t() from t_lookup_cancel() function, and introducing
updated udp_mtu handling code - fixes SER-433
documenting t_is_expired() function
t_is_expired() script function is introduced.
* logging API updated (see doc/logging-api.txt for details)
- AS support disabled by default.
When building the route set of ACKs for local UACs, only the reply is now
In case the AVP is a regexp, an allocation is required to build an AVP
Currently, SER matches E2E ACKs only if there is an equality between From HF
The calculate_routeset_length() produces an invalid result in the case
'memapp' and 'append_mem_block' are now both only used in source
"Route :" prefix (and separator) is used some more time across the
script: udp_mtu fallback script config & commands
core: forward: tcp fallback for big udp packets
---
26 Feb
26 Feb
2:06 p.m.
New subject: [SR-Dev] git:master: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router
I didn't really mean to commit the to merges into master, I merged a wrong
branch. This is a side-effect of having --no-ff on master branch and doing
work on the master branch :-).
I only meant to commit the cfg_size fix but picked a wrong branch when doing
git push.
Jan.
On 26-02 13:02, Jan Janak wrote:
Module: sip-router
Branch: master
Commit: 90bb3224cc75db8dbaab3c2c21c54dddad544b79
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90bb322…
Author: Jan Janak <jan(a)iptel.org>
Committer: Jan Janak <jan(a)iptel.org>
Date: Mon Feb 23 22:58:35 2009 +0100
Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router
* 'master' of ssh://janakj@git.sip-router.org/sip-router:
tcp: fix compilation problem on solaris (FIONREAD)
core: fix bad level name in new LOG()
t_check_status() checks also the blind UACs if t_pick_branch()
Documenting t_lookup_cancel() script function.
Removing set_t() from t_lookup_cancel() function, and introducing
updated udp_mtu handling code - fixes SER-433
documenting t_is_expired() function
t_is_expired() script function is introduced.
* logging API updated (see doc/logging-api.txt for details)
- AS support disabled by default.
When building the route set of ACKs for local UACs, only the reply is now
In case the AVP is a regexp, an allocation is required to build an AVP
Currently, SER matches E2E ACKs only if there is an equality between From HF
The calculate_routeset_length() produces an invalid result in the case
'memapp' and 'append_mem_block' are now both only used in source
"Route :" prefix (and separator) is used some more time across the
script: udp_mtu fallback script config & commands
core: forward: tcp fallback for big udp packets
---
_______________________________________________
sr-dev mailing list
sr-dev(a)lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
2:25 p.m.
New subject: [SR-Dev] git:master: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router
On Feb 26, 2009 at 13:06, Jan Janak <jan(a)iptel.org> wrote:
I didn't really mean to commit the to merges into
master, I merged a wrong
branch. This is a side-effect of having --no-ff on master branch and doing
work on the master branch :-).
Sometimes you have to use --ff :-)
We can try a revert if you wish (re-writing master to the commit id
before the merge and retry, IMHO a good exercise for things to come
:-)). If somebody fetched in the meantime, he would have then to run git
fetch -f.
I only meant to commit the cfg_size fix but picked a wrong branch when doing
git push.
When I'm mergin from ser, I always merge ser_core/cvs-head into the
ser_core_cvs branch, and then merge origin/ser_core_cvs into master.
This way is easier to see where the commits come from.
Andrei
2:38 p.m.
New subject: [SR-Dev] git:master: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router
On 26-02 13:25, Andrei Pelinescu-Onciul wrote:
On Feb 26, 2009 at 13:06, Jan Janak
<jan(a)iptel.org> wrote:
No, I don't think it is necessary, those two merge commit only add more
noise to the history, but they don't harm.
Jan.
I didn't really mean to commit the to merges
into master, I merged a wrong
branch. This is a side-effect of having --no-ff on master branch and doing
work on the master branch :-).
Sometimes you have to use --ff :-)
We can try a revert if you wish (re-writing master to the commit id
before the merge and retry, IMHO a good exercise for things to come
:-)). If somebody fetched in the meantime, he would have then to run git
fetch -f.
5751
days inactive
5751
days old
3 comments
2 participants
participants (2)
-
Andrei Pelinescu-Onciul -
Jan Janak