Code

Merge pull request #1386 from rubenk/rrdtool-unlock-on-error