From bceb020d7285566f39603341ae767290d90b65dc Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 8 Aug 2017 11:50:16 -0700
Subject: [PATCH] Update changelog and readme

---
 CHANGELOG.md | 8 +++++---
 README.md    | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429f934c..6911e0c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,12 +15,13 @@
 ### New Plugins
 
 - [fail2ban](./plugins/inputs/fail2ban/README.md) - Thanks to @grugrut
-- [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
 - [fluentd](./plugins/inputs/fluentd/README.md) - Thanks to @DanKans
-- [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
 - [histogram](./plugins/aggregators/histogram/README.md) - Thanks to @vlamug
-- [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
+- [minecraft](./plugins/inputs/minecraft/README.md) - Thanks to @adamperlin & @Ayrdrie
+- [openldap](./plugins/inputs/openldap/README.md) - Thanks to @cobaugh
+- [salesforce](./plugins/inputs/salesforce/README.md) - Thanks to @rody
 - [win_services](./plugins/inputs/win_services/README.md) - Thanks to @vlastahajek
+- [zipkin](./plugins/inputs/zipkin/README.md) - Thanks to @adamperlin & @Ayrdrie
 
 ### Features
 
@@ -54,6 +55,7 @@
 - [#3080](https://github.com/influxdata/telegraf/pull/3080): Add zipkin input plugin.
 - [#3023](https://github.com/influxdata/telegraf/pull/3023): Add Windows Services input plugin.
 - [#3098](https://github.com/influxdata/telegraf/pull/3098): Add path tag to logparser containing path of logfile.
+- [#3075](https://github.com/influxdata/telegraf/pull/3075): Add salesforce input plugin.
 
 ### Bugfixes
 
diff --git a/README.md b/README.md
index 9e72a8f5..875960cb 100644
--- a/README.md
+++ b/README.md
@@ -162,6 +162,7 @@ configuration options.
 * [redis](./plugins/inputs/redis)
 * [rethinkdb](./plugins/inputs/rethinkdb)
 * [riak](./plugins/inputs/riak)
+* [salesforce](./plugins/inputs/salesforce)
 * [sensors](./plugins/inputs/sensors)
 * [snmp](./plugins/inputs/snmp)
 * [snmp_legacy](./plugins/inputs/snmp_legacy)
-- 
GitLab