Skip to content

Commit

Permalink
Merge pull request #301 from influxdata/nc-issue#300
Browse files Browse the repository at this point in the history
Fixes #300
  • Loading branch information
Nathaniel Cook committed Mar 10, 2016
2 parents 4e2409f + 3d5cb46 commit c2a23ee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ With #144 you can now join streams with differing group by dimensions.
- [#255](https://github.com/influxdata/kapacitor/issues/255): Add OPTIONS handler for task delete method so it can be preflighted.
- [#258](https://github.com/influxdata/kapacitor/issues/258): Fix UDP internal metrics, change subscriptions to use clusterID.
- [#240](https://github.com/influxdata/kapacitor/issues/240): BREAKING: Fix issues with Sensu integration. The breaking change is that the config no longer takes a `url` but rather a `host` option since the communication is raw TCP rather HTTP.
- [#270](https://github.com/influxdata/kapacitor/issues/258): The HTTP server will now gracefully stop.
- [#270](https://github.com/influxdata/kapacitor/issues/270): The HTTP server will now gracefully stop.
- [#300](https://github.com/influxdata/kapacitor/issues/300): Add OPTIONS method to /recording endpoint for deletes.

## v0.10.1 [2016-02-08]

Expand Down
6 changes: 6 additions & 0 deletions services/replay/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ func (r *Service) Open() error {
Pattern: "/recording",
HandlerFunc: r.handleDelete,
},
{
Name: "recording-delete",
Method: "OPTIONS",
Pattern: "/recording",
HandlerFunc: httpd.ServeOptions,
},
{
Name: "record",
Method: "POST",
Expand Down

0 comments on commit c2a23ee

Please sign in to comment.