Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0

This commit is contained in:
Fabian Reinartz 2017-09-04 13:10:50 +02:00
commit c70379e1c7
2 changed files with 2 additions and 2 deletions

View file

@ -337,7 +337,7 @@ func main() {
// Set web server to ready.
webHandler.Ready()
log.Info("Server is Ready to receive requests.")
log.Info("Server is ready to receive requests.")
term := make(chan os.Signal)
signal.Notify(term, os.Interrupt, syscall.SIGTERM)

View file

@ -176,7 +176,7 @@ func (s *Admin) TSDBSnapshot(_ context.Context, _ *pb.TSDBSnapshotRequest) (*pb.
return &pb.TSDBSnapshotResponse{Name: name}, nil
}
// DeleteSeries imeplements pb.AdminServer.
// DeleteSeries implements pb.AdminServer.
func (s *Admin) DeleteSeries(_ context.Context, r *pb.SeriesDeleteRequest) (*pb.SeriesDeleteResponse, error) {
mint, maxt, err := extractTimeRange(r.MinTime, r.MaxTime)
if err != nil {