Fabian Reinartz 669075c6b9 Merge branch 'master' into dev-2.0

2017-06-06 09:36:51 +02:00

..

testdata

Add ServerName into TLS Config

2016-05-26 14:24:49 -07:00

helpers_test.go

storage: update TSDB

2017-05-22 11:53:08 +02:00

scrape_test.go

Merge pull request #2787 from prometheus/limit2

2017-06-06 08:21:12 +02:00

scrape.go

Merge branch 'master' into dev-2.0

2017-06-06 09:36:51 +02:00

target_test.go

Merge branch 'master' into dev-2.0

2017-04-04 15:17:56 +02:00

target.go

Merge branch 'master' into dev-2.0

2017-06-06 09:36:51 +02:00

targetmanager_test.go

retrieval: fix test

2017-03-08 15:37:12 +01:00

targetmanager.go

Merge branch 'master' into dev-2.0

2017-06-06 09:36:51 +02:00