lp:~klondike/adchpp/adchpp

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:adchpp

Francisco Blas Izquierdo Riera (klondike): Abstain on 2013-07-10

poy: Needs Fixing on 2013-02-26

Diff: 617 lines (+294/-65)

14 files modified

SConstruct (+26/-10)
build_util.py (+42/-14)
lua/LuaFileSystem/SConscript (+2/-4)
lua/LuaSocket/mime/SConscript (+2/-3)
lua/LuaSocket/socket/SConscript (+2/-3)
lua/SConscript (+33/-12)
plugins/Bloom/src/BloomManager.cpp (+24/-2)
plugins/Bloom/src/BloomManager.h (+23/-2)
plugins/Script/examples/access.lua (+2/-2)
plugins/Script/examples/checkemptyinbloom.lua (+31/-0)
plugins/Script/src/SConscript (+5/-3)
swig/SConscript (+17/-9)
swig/bloom.i (+84/-0)
swig/lua.i (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1128591: +regnick is broken on trunk	Undecided	Fix Released
Bug #1130835: Allow TTH searchs on the bloom plugin to other plugins	Wishlist	Fix Released
Bug #1131570: adchpp::Core *getCurrentCore in swig/lua.i is broken because it shouldn't use fixed indices	Undecided	Fix Released
Bug #1131963: The function add_stats(stat) should be exported	Wishlist	Fix Released
Bug #1132332: The transition to STATE_DATA is not marked when using setDataMode	Undecided	Won't Fix
Bug #1132636: Allow using the system lua libraries	Wishlist	Fix Released
Bug #1132714: Allow using the system boost libraries	Wishlist	Fix Released

Link a bug report

Related blueprints

664. By Francisco Blas Izquierdo Riera (klondike) on 2013-09-28

merging with upstream

663. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-16

Update changelog

662. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-16

Fix bug lp:907291 adding propper support for sigterm (and also SIGBUS and SIGABRT)

661. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-11

Merge poy's fixes :)

660. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-11

Push the branch updates to the changelog

659. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-10

Fix also example script

658. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-10

I forgot the templates definitions...

657. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-10

I forgot the templates

656. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-10

I was using the bm instead of the cm to know when the client goes to connected

655. By Francisco Blas Izquierdo Riera (klondike) on 2013-07-10

Update the example for the new API