Code

Fix force-push to master#2094

Code

Merged

2opremio merged 9 commits intomasterweaveworks/scope:masterfrom maybe-old-masterweaveworks/scope:maybe-old-masterCopy head branch name to clipboardDec 15, 2016

+269-147

Commits

Commits on Dec 5, 2016

• ecs reporter: Fix some log lines that were passing *string instead of string

  ekimekim

  committed
  fb12df6

  Copy full SHA for fb12df6

Commits on Dec 12, 2016

• Add flag for logging headers

  jml

  committed
  4fcf9a1

  Copy full SHA for 4fcf9a1

• Neater way of doing it

  jml

  committed
  626e8a3

  Copy full SHA for 626e8a3

• Vendor new weaveworks/common

  jml

  committed
  256e480

  Copy full SHA for 256e480

• Log whether it's a websocket request

  jml

  committed
  a8ba7b2

  Copy full SHA for a8ba7b2

Commits on Dec 13, 2016

• Add extras/dialer

  Show description for 4d20a91
  schu

  committed
  4d20a91

  Copy full SHA for 4d20a91

Commits on Dec 14, 2016

• Merge pull request #2082 from kinvolk/schu/tools-dialer

  Show description for a1d9db8
  

  Alfonso Acosta

  authored
  a1d9db8

  Copy full SHA for a1d9db8

• Merge pull request #2086 from weaveworks/log-request-headers

  Show description for 3560bbc
  jml

  authored
  3560bbc

  Copy full SHA for 3560bbc

• Merge pull request #2060 from weaveworks/mike/awsecs/fix-log-formatting

  Show description for 5ed63de
  ekimekim

  authored
  5ed63de

  Copy full SHA for 5ed63de