Merge branch 'master' into develop

This commit is contained in:
Torkel Ödegaard committed 2017-10-12 16:32:44 +02:00
commit 88ceb19d96
41 files changed
+691 -191

No files matched your search

+1
View File
@@ -304,6 +304,7 @@ func (hs *HttpServer) registerRoutes() {
annotationsRoute.Delete("/:annotationId", wrap(DeleteAnnotationById))
annotationsRoute.Put("/:annotationId", bind(dtos.UpdateAnnotationsCmd{}), wrap(UpdateAnnotation))
annotationsRoute.Delete("/region/:regionId", wrap(DeleteAnnotationRegion))
annotationsRoute.Post("/graphite", bind(dtos.PostGraphiteAnnotationsCmd{}), wrap(PostGraphiteAnnotation))
}, reqEditorRole)
// error test