Subversion MERGE error on commit nailed

Recently I’ve had a problem with subversion commits returning a ‘200 OK’ result, accompanied by a peculiar MERGE error (when I’m not doing a merge), but weirdly, the commit had actually made it into the repo. I’d googled for this a while ago with no success, but I had another try today and found this post. Thinking about it, I’d had this problem since updating to the very-very-long-awaited trac 0.11 release. So I tracked down the latest release of the trac-post-commit-hook script and installed that, and amazingly enough, it just works. Thank you UberGeek!

Munin per-plugin timeouts

I had a munin plugin that suddenly stopped reporting, and in the munin-node log there were lots of errors like this:

2007/06/27-06:50:26 Plugin timeout: myplugin : Interrupted system call

So it looks like the plugin is taking too long, but how to extend the timeout? Seems I’m not alone in wondering this. So I had a rummage in the source of munin-node, and it seems to want a ‘timeout’ parameter in its config. So I added a simple timeout 60 to munin-node.conf and it worked! However, that’s a global setting rather than a per-plugin timeout, so I took a flying guess at putting the same directive in my plugin spec in /etc/munin/plugin-conf.d/munin-node like this:
timeout 60
user root

And that worked too!