[SR-Dev] git:master: Merge branch janakj/flatstore into branch master

[Jan Janak]

Andrei,

So this is a merge of janakj/flatstore into master with --no-ff option
(otherwise the merge would have resulted in a fast-forward merge again).

I think I like this variant better, because it actually records that the stuff
was merged from another branch and it looks better (at least to my eyes) in
the tree graph in gitk.

So I'd recommend we use --no-ff with git-merge by default.

   Jan.

On 19-02 00:05, Jan Janak wrote:
> Module: sip-router
> Branch: master
> Commit: 8be42318025c413d0aecf01f84d32b5e1a0af2f6
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8be42318025c413d0aecf01f84d32b5e1a0af2f6
> 
> Author: Jan Janak <jan at iptel.org>
> Committer: Jan Janak <jan at iptel.org>
> Date:   Thu Feb 19 00:02:32 2009 +0100
> 
> Merge branch janakj/flatstore into branch master
> 
> * commit 'origin/janakj/flatstore': (57 commits)
>   Make km_sources compile, part two.
>   Link with libkmi, sources from kamailio use the management interface.
>   Make km_ sources compile:
>   Link also with libsrdb1
>   Added prefix km_ to locally included header files.
>   Align defines protecting header files with filenames.
>   Remove km_Makefile and km_README.
>   Renamed to db_flatstore.
>   Make the module compile in the sip-router source tree.
>   - disable big integer (DB_BIGINT) support for non SQL DB modules for now
>   - don't link with unnecessary libs, related to bug #1855859
>   - fix link entity names, patch from Carsten Gross
>   - rebuilt default READMEs
>   - renaming: changed entities in documentation
>   - renaming scripts part 1
>   - fix some FAQ entries, change missing entity, regenerate READMEs
>   - change name in copyright headers
>   - a set of minimalistic config files for testing purposes
>   - adding missing end of doxygen group
>   - missing READMEs added
>   ...
> 
> ---
> 
> 
> 
> 
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev