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

12 Sep 2014

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=74f53b7…

 Author: Carsten Bock &lt;carsten(a)ng-voice.com&gt;
 Committer: Carsten Bock &lt;carsten(a)ng-voice.com&gt;
 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/a…

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

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