From a177d5c486a579262f71e779fd6e8b8d05d5ff00 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Wed, 4 Apr 2018 17:59:22 +0200
Subject: [PATCH] updated

---
 ChangeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 2ecfb5b5..f2402834 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -14,6 +14,7 @@
 * added automatic reconnect to MQTT broker
 * changed logging for messages from "updated" to "received" and "sent" depending on who initiated the request
 * added support for serving .csv files and new argument maxage to HTTP/JSON port
+* added timeout argument and error result code to ebusctl
 
 
 # 3.1 (2017-12-26)