Code

Rebase to 1.9.1#18003

Code

Merged

liggitt merged 6 commits intoopenshift:masteropenshift/origin:masterfrom deads2k:rebase-to1.9.1deads2k/origin:rebase-to1.9.1Copy head branch name to clipboardJan 10, 2018

+9,015-71,385

Commits

Commits on Jan 9, 2018

• update glide.yaml

  deads2k

  committed
  0a67e96

  Copy full SHA for 0a67e96

• bump(*)

  deads2k

  committed
  754f5e2

  Copy full SHA for 754f5e2

• UPSTREAM: <carry>: allow injection of controller context function

  deads2k

  committed
  58710a2

  Copy full SHA for 58710a2

• UPSTREAM: 58018: make controller port exposure optional

  deads2k

  committed
  866368d

  Copy full SHA for 866368d

• update to handle audit changes

  deads2k

  committed
  2dd2187

  Copy full SHA for 2dd2187

Commits on Jan 10, 2018

• generated

  deads2k

  committed
  7294520

  Copy full SHA for 7294520