projects / collectd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6997fb3 65b7908)
octo@leeloo:~/collectd $ svn merge -r737:784 branches/apcups trunk
authorocto <octo>
Tue, 6 Jun 2006 08:05:39 +0000 (08:05 +0000)
committerocto <octo>
Tue, 6 Jun 2006 08:05:39 +0000 (08:05 +0000)
commit09cc422eeae5dd0fa1e5f1f6b472b8c959b315d9
tree54a0f145bb0a86fb0da212eafc7fb775b3f383edtree | snapshot
parent6997fb33937331faf321fd825d1ae99dd0a6d8f1commit | diff
parent65b790885ecc7f2663f758b8a67b855a05a91c23commit | diff
octo@leeloo:~/collectd $ svn merge -r737:784 branches/apcups trunk

The trunk did not compile with the `apcups' plugin enabled. Since it's enabled
by default some extra action was neccessary. The `apcups' plugin in the branch
compiles and may be useable, so I'm merging it back to get to some consistent
state.
collectd.spec diff1 | diff2 | blob | history
collectd, the system statistics collection daemon