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.

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

Dev to alpha #1394

Merged
merged 56 commits into from
Sep 12, 2018
Merged

Dev to alpha #1394

merged 56 commits into from
Sep 12, 2018

Conversation

aermakov-zalando
Copy link
Contributor

Kubernetes 1.11.

linki and others added 30 commits July 3, 2018 12:59
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>

# Conflicts:
#	cluster/manifests/kube-proxy/daemonset.yaml
#	cluster/node-pools/master-default/userdata.clc.yaml
#	cluster/node-pools/worker-default/userdata.clc.yaml
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
ZMON: use a user-defined priority class
Signed-off-by: Alexey Ermakov <[email protected]>
mikkeloscar and others added 19 commits August 27, 2018 15:34
Signed-off-by: Alexey Ermakov <[email protected]>
Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>
@mikkeloscar
Copy link
Contributor

👍

1 similar comment
@aermakov-zalando
Copy link
Contributor Author

👍

@aermakov-zalando aermakov-zalando merged commit 0b939d8 into alpha Sep 12, 2018
@aermakov-zalando aermakov-zalando deleted the dev-to-alpha branch September 12, 2018 08:17
@szuecs szuecs mentioned this pull request Sep 12, 2018
@mikkeloscar mikkeloscar mentioned this pull request Sep 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants