26 Aug
2010
26 Aug
'10
12:31 p.m.
2010/8/26 Juha Heinanen <jh(a)tutpro.com>om>:
Jon Bonilla (Manwe) writes:
Hi Juha. For sure your commit is the responsible of this error (I mean
the commit whose mail has started this mail thread).
This is your commit:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5da493e…
Note that in the commit comment there also appears:
-------------------
Conflicts:
modules/lcr/lcr_mod.c
------------------
And inspecting the diff or the resulting modules/lcr/lcr_mod.c it's
clear that your commit included a git conflict. See line 1698 in
http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/…
Regards.
--
Iñaki Baz Castillo
<ibc(a)aliax.net>
Could you please check this commit? All my
nightly builds of kamailio_3.0
branch have failed while compiling the lcr module and this commit seems to be
responsible of that :)
jon,
i don't know what has happened. i already asked about it on sr-dev
list. my kamailio_3.0 commit (below) didn't involve lcr module.
andrei did an lcr related commit, but i don't know if that did anything
wrong either.