![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 1 Oct 2009 19:34:21 +0000 (21:34 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Thu, 1 Oct 2009 19:34:21 +0000 (21:34 +0200) |
Conflicts:
src/types.db
src/types.db
| 1 | 2 | |||
|---|---|---|---|---|
| README | patch | | diff1 | | diff2 | | blob | history |
| src/types.db | patch | | diff1 | | diff2 | | blob | history |
diff --cc README
Simple merge
diff --cc src/types.db
index c6526d42a5ba956b877bf373dce3ae87b08b8409,8ac9dd4f7b8f06ddf0c7a472a23e0988b7cdb999..960674c00c68a3f0a5c41bca8ea2774329dc5244
--- 1/src/types.db
--- 2/src/types.db
+++ b/src/types.db
ps_state value:GAUGE:0:65535
ps_vm value:GAUGE:0:9223372036854775807
queue_length value:GAUGE:0:U
- records count:GAUGE:0:U
+response_time value:GAUGE:0:U
+ records count:GAUGE:0:U
route_etx value:GAUGE:0:U
route_metric value:GAUGE:0:U
routes value:GAUGE:0:U