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

[Victor Seva]

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.sip-router.org/pipermail/sr-dev/attachments/20140912/6f99fdbc/attachment.pgp>