Skip to content

Commit

Permalink
Merge branch 'simnv-opentsdb-log-less'
Browse files Browse the repository at this point in the history
  • Loading branch information
toddboom committed Apr 12, 2016
2 parents cfa50bb + 00ed9eb commit 36ca49c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- [#6270](https://github.com/influxdata/influxdb/issues/6270): tsm1 query engine alloc reduction
- [#6271](https://github.com/influxdata/influxdb/issues/6271): Fixed deadlock in tsm1 file store.
- [#6287](https://github.com/influxdata/influxdb/issues/6287): Fix data race in Influx Client.
- [#6252](https://github.com/influxdata/influxdb/pull/6252): Remove TSDB listener accept message @simnv

## v0.12.0 [2016-04-05]
### Release Notes
Expand Down
1 change: 0 additions & 1 deletion services/opentsdb/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ func (ln *chanListener) Accept() (net.Conn, error) {
if !ok {
return nil, errors.New("network connection closed")
}
log.Println("TSDB listener accept ", conn)
return conn, nil
}

Expand Down

0 comments on commit 36ca49c

Please sign in to comment.