[sr-dev] git:master: Merge branch 'master' of ssh://git.sip-router.org/ sip-router into carstenbock/db_cassandra_deb

[Carsten Bock]

Hi Victor,

sorry, fixed. That was an accident.

Thanks,
Carsten

2014-09-12 12:30 GMT+02:00 Victor Seva <linuxmaniac at torreviejawireless.org>:
> On 09/11/2014 04:57 PM, Carsten Bock wrote:
>> Module: sip-router
>> Branch: master
>> Commit: 74f53b7d7f6ff00144152aff453e6b388447320c
>> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74f53b7d7f6ff00144152aff453e6b388447320c
>>
>> Author: Carsten Bock <carsten at ng-voice.com>
>> Committer: Carsten Bock <carsten at ng-voice.com>
>> Date:   Thu Sep 11 16:56:51 2014 +0200
>>
>> Merge branch 'master' of ssh://git.sip-router.org/sip-router into carstenbock/db_cassandra_deb
>>
>> Conflicts:
>>       Makefile.groups
>>       pkg/kamailio/deb/wheezy/control
>>       pkg/kamailio/deb/wheezy/rules
>>
>
> This breaks wheezy builds. Please revert.
>
> [0]
> https://kamailio.sipwise.com/view/kamdev/job/kamailiodev-nightly-binaries/architecture=amd64,distribution=wheezy,label=slave/156/console
>



-- 
Carsten Bock
CEO (Geschäftsführer)

ng-voice GmbH
Schomburgstr. 80
D-22767 Hamburg / Germany

http://www.ng-voice.com
mailto:carsten at ng-voice.com

Office +49 40 34927219
Fax +49 40 34927220

Sitz der Gesellschaft: Hamburg
Registergericht: Amtsgericht Hamburg, HRB 120189
Geschäftsführer: Carsten Bock
Ust-ID: DE279344284

Hier finden Sie unsere handelsrechtlichen Pflichtangaben:
http://www.ng-voice.com/imprint/