Skip to content

Commit

Permalink
Merged pull request influxdata#1324 from influxdata/v1.2
Browse files Browse the repository at this point in the history
Merge back v1.2 fixes
  • Loading branch information
nathanielc committed Apr 13, 2017
2 parents d5215f5 + 4628bda commit c30e8f2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ kapacitor define-handler system aggregate_by_1m.yaml
- [#1295](https://github.com/influxdata/kapacitor/issues/1295): Fix curruption of recordings list after deleting all recordings.
- [#1237](https://github.com/influxdata/kapacitor/issues/1237): Fix missing "vars" key when listing tasks.
- [#1271](https://github.com/influxdata/kapacitor/issues/1271): Fix bug where aggregates would not be able to change type.
## v1.2.1 [2017-04-13]

### Bugfixes

- [#1323](https://github.com/influxdata/kapacitor/pull/1323): Fix issue where credentials to InfluxDB could not be updated dynamically.

## v1.2.0 [2017-01-23]

Expand Down
4 changes: 3 additions & 1 deletion influxdb/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ func (c *HTTPClient) Update(new Config) error {
return err
}
c.urls = urls
if old.Timeout != new.Timeout || old.Transport != new.Transport {
if old.Credentials != new.Credentials ||
old.Timeout != new.Timeout ||
old.Transport != new.Transport {
//Replace the client
tr := new.Transport
if tr == nil {
Expand Down

0 comments on commit c30e8f2

Please sign in to comment.