[rrd-developers] bad merges

[Tobias Oetiker]

Today kevin brintnall wrote:

> Tobi,
>
> This patch removes an extra "SIGNALS" section in the rrdcached.pod and
> merges "[BUG] fixed hang in flush_file() introduced by per-file flush
> condition".  This should apply nicely to trunk.

indeed it does
tobi

-- 
Tobi Oetiker, OETIKER+PARTNER AG, Aarweg 15 CH-4600 Olten, Switzerland
http://it.oetiker.ch tobi at oetiker.ch ++41 62 775 9902 / sb: -9900