Vendor update#1510

Merged

tomwilkie merged 11 commits intocortexproject:masterfrom

codesome:vendor

Aug 7, 2019

Commits on Jul 12, 2019

Vendor update
Ganesh Vernekar
committed
Fix legacy_promql
Ganesh Vernekar
committed

Commits on Jul 15, 2019

Updated weaveworks/common fix
Ganesh Vernekar
committed
Vendored API conflicts
Ganesh Vernekar
committed
Fix alertmanager APIs
Ganesh Vernekar
committed

Commits on Jul 16, 2019

AlertmanagerAPIVersionV2 in ruler
Ganesh Vernekar
committed

Commits on Jul 29, 2019

Merge remote-tracking branch 'upstream/master' into vendor
Ganesh Vernekar
committed

Commits on Jul 31, 2019

Use remove-alertmanager branch of Prometheus
Ganesh Vernekar
committed
Merge remote-tracking branch 'upstream/master' into vendor
Ganesh Vernekar
committed
Undo changes to alertmanager
Ganesh Vernekar
committed
Modified alertmanager 0.13
Ganesh Vernekar
committed