Code

1.7.7, 1.7.8 Cherry picks#16722

Code

Merged

openshift-merge-robot merged 11 commits intoopenshift:masteropenshift/origin:masterfrom soltysh:cherry-pickssoltysh/origin:cherry-picksCopy head branch name to clipboardOct 11, 2017

+1,776-99

Commits

Commits on Oct 9, 2017

• UPSTREAM: 52823: Third party resources should not be part of conformance

  Show description for c20a371
  soltysh

  committed
  c20a371

  Copy full SHA for c20a371

• UPSTREAM: 51199: Makes Hostname and Subdomain fields of v1.PodSpec settable when empty and updates the StatefulSet controller to set them when empty

  soltysh

  committed
  993e6f3

  Copy full SHA for 993e6f3

• UPSTREAM: 52602: etcd3 store: retry w/live object on conflict

  soltysh

  committed
  379148d

  Copy full SHA for 379148d

• UPSTREAM: 52545: use specified discovery information if possible

  soltysh

  committed
  9b006c4

  Copy full SHA for 9b006c4

• UPSTREAM: 52775: Fix panic in ControllerManager when GCE external loadbalancer healthcheck is nil

  soltysh

  committed
  7a029c0

  Copy full SHA for 7a029c0

• UPSTREAM: 52947: Preserve leading and trailing slashes on proxy subpaths

  soltysh

  committed
  9fdb4ed

  Copy full SHA for 9fdb4ed

• UPSTREAM: 53299: Correct APIGroup for RoleBindingBuilder Subjects

  soltysh

  committed
  9f20f52

  Copy full SHA for 9f20f52

Commits on Oct 10, 2017

• UPSTREAM: 52604: Use separate client for node status loop

  soltysh

  committed
  88592ac

  Copy full SHA for 88592ac

• UPSTREAM: 53332: Ignore pods for quota that exceed deletion grace period

  soltysh

  committed
  714d511

  Copy full SHA for 714d511

• UPSTREAM: 53457: Ignore notFound when deleting firewall

  soltysh

  committed
  5d4c7f1

  Copy full SHA for 5d4c7f1

• Origin changes after cherry-picks

  soltysh

  committed
  c1f8eef

  Copy full SHA for c1f8eef