Code

rebase to kube 1.11 GA#20164

Code

Merged

openshift-merge-robot merged 5 commits intoopenshift:masteropenshift/origin:masterfrom deads2k:rebase-13-re-rebasedeads2k/origin:rebase-13-re-rebaseCopy head branch name to clipboardJul 2, 2018

+17,761-33,013

Commits

Commits on Jul 2, 2018

• update glide for 1.11 GA

  deads2k

  committed
  633c65f

  Copy full SHA for 633c65f

• bump(*)

  deads2k

  committed
  4ed8496

  Copy full SHA for 4ed8496

• generated

  deads2k

  committed
  d9f2790

  Copy full SHA for d9f2790

• UPSTREAM: <carry>: coerce string->int, empty object -> slice for backwards compatibility

  Show description for 403f02f
  

  liggitt

  authored and

  deads2k

  committed
  403f02f

  Copy full SHA for 403f02f

• Add tests to ensure type coercion handles errors correctly

  

  liggitt

  authored and

  deads2k

  committed
  3506509

  Copy full SHA for 3506509