Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DO NOT MERGE] daemonset handle DeletedFinalStateUnknown #9010

Closed
wants to merge 24 commits into from
Closed

[DO NOT MERGE] daemonset handle DeletedFinalStateUnknown #9010

wants to merge 24 commits into from

Conversation

pweil-
Copy link
Contributor

@pweil- pweil- commented May 24, 2016

Fixes #8946

upstream pick for kubernetes/kubernetes#25913

Queuing it up for merge AFTER the rebase lands (branch is based on the rebase to apply the patch cleanly)

mfojtik and others added 24 commits May 24, 2016 20:17
@mfojtik
bump(k8s.io/kubernetes): a289b151cef41ebb487a7658b782b2b1bf67d0e4
f7a1b44
@mfojtik
bump(gopkg.in/yaml.v2) a83829b6f1293c91addabc89d0571c246397bbf4
ce2a73e
@mfojtik
bump(github.com/skynetservices/skydns): 1be70b5b8aa07acccd972146d8401…
0bab719 
…1b670af88b4
@mfojtik
bump(github.com/onsi/gomega): 7ce781ea776b2fd506491011353bded2e40c8467
2c5a621
@mfojtik
bump(github.com/fsouza/go-dockerclient): bf97c77db7c945cbcdbf09d56c6f…
3225d6e 
…87a66f54537b
@mfojtik
bump(github.com/emicklei/go-restful): 496d495156da218b9912f03dfa7df7f…
91c6bc5 
…80fbd8cc3
@mfojtik
bump(github.com/coreos): 8b320e7c550067b1dfb37bd1682e8067023e0751
8389bb3
@mfojtik
bump(github.com/onsi/ginkgo): 2c2e9bb47b4e44067024f29339588cac8b34dd12
0c6cf92
@mfojtik
bump(github.com/spf13/cobra): 4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f
9bb2f39
@mfojtik
bump(github.com/google/cadvisor): 750f18e5eac3f6193b354fc14c03d92d431…
d0de410 
…8a0ec
@mfojtik
bump(github.com/docker/engine-api): 3d72d392d07bece8d7d7b2a3b6b2e57c2…
02de64c 
…df376a2
@mfojtik
bump(denverdino/aliyungo): 554da7ebe31b6172a8f15a0b1cf8c628145bed6a
f3e50da
@mfojtik
UPSTREAM: github.com/openshift: <carry>: Fix integers and add missing…
6d425ef 
… methods to OVS plugin
@smarterclayton @mfojtik
UPSTREAM: emicklei/go-restful: <carry>: Add "Info" to go-restful ApiDecl
31bf202
@mfojtik
UPSTREAM: github.com/google: <carry>: Disable container_hints flag th…
81c389f 
…at is set twice
@smarterclayton @mfojtik
UPSTREAM: github.com/skynetservices: <carry>: Disable systemd activat…
f676851 
…ion for DNS

Need to work with go-systemd to see if we can abstract the syscall.CloseOnExec
which is not supported on windows.
@smarterclayton @mfojtik
UPSTREAM: github.com/skynetservices: <carry>: Allow listen only ipv4
4806551
@mfojtik
UPSTREAM: 26078: Fix panic when the namespace flag is not present
825b681
@mfojtik
UPSTREAM: <drop>: Fix integers in rolling updater
93e639f
@mfojtik
UPSTREAM: 25804: Add BatchClient into clientset adaption
f3341c5
@mfojtik
Boring refactor to match changes upstream
4deea58
@mfojtik
Interesting refactor to match changes upstream
a9ec051
@csrwng @mfojtik
Use Docker engine-api client for daemon info
135fbfc
@pweil-
UPSTREAM: 25913: daemonset handle DeletedFinalStateUnknown
ce24868
@openshift-bot
Copy link
Contributor

Origin Action Required: Pull request cannot be automatically merged, please rebase your branch from latest HEAD and push again

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 24, 2016
@openshift-bot openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jun 11, 2016
@pweil- pweil- closed this Sep 21, 2016
@pweil- pweil- deleted the ds-delete branch September 21, 2016 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@pweil- @openshift-bot @mfojtik @smarterclayton @csrwng