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

Update Dashboard UI addon to v1.0.1 #23724

Merged
merged 1 commit into from
Apr 4, 2016
Merged

Update Dashboard UI addon to v1.0.1 #23724

merged 1 commit into from
Apr 4, 2016

Conversation

maciaszczykm
Copy link
Member

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 1, 2016
@bryk bryk assigned bryk and unassigned zmerlynn Apr 1, 2016
@bryk
Copy link
Contributor

bryk commented Apr 1, 2016

LGTM

@bryk bryk added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 1, 2016
@bryk
Copy link
Contributor

bryk commented Apr 1, 2016

Can you add release notes: https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/release-notes.md ?

@k8s-github-robot
Copy link

Removing LGTM because the release note process has not been followed.
One of the following labels is required "release-note", "release-note-none", or "release-note-action-required"
Please see: https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/release-notes.md

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 1, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit a14e4c1984935e1d489fa58e896d3be95ac1c4e9.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

@maciaszczykm
Copy link
Member Author

@bryk Added new entry to release notes in CHANGELOG.md. Is it okay? I'm not sure about its placement, because v1.3.0-alpha.1 pre-release is already published.

@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit 1310e08849e3abcdd18d5fd37e93e8e9f55fb041.

@bryk bryk added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 1, 2016
@bryk
Copy link
Contributor

bryk commented Apr 1, 2016

Please revert the changelog. All we need to do is add release-note label.

@maciaszczykm
Copy link
Member Author

Please revert the changelog. All we need to do is add release-note label.

@bryk Done. It wasn't so easy to understand how to proceed with it to me. Hopefully now it's okay.

@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit 7733a1c97daebd4cfd5cead6d5ea10614e424224.

@bryk bryk added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge and removed needs-ok-to-merge labels Apr 1, 2016
@maciaszczykm
Copy link
Member Author

@bryk I can see, that one of the tests failed. I do not see any connection to changes made, could you take a look?

@bryk
Copy link
Contributor

bryk commented Apr 1, 2016

@roberthbailey How can I rerun the "Jenkins GCE Node e2e" test? It looks flaky.

@roberthbailey
Copy link
Contributor

How can I rerun the "Jenkins GCE Node e2e" test? It looks flaky.

@pwittrock recently added that test and said he'd keep an eye on it so let's just ping him and ask what he'd like to do.

@roberthbailey
Copy link
Contributor

@bryk Should this be a cherry pick candidate? It looks like 1.0.1 fixed quite a few bugs.

@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-bot
Copy link

k8s-bot commented Apr 3, 2016

GCE e2e build/test passed for commit 7733a1c97daebd4cfd5cead6d5ea10614e424224.

@bryk
Copy link
Contributor

bryk commented Apr 4, 2016

@roberthbailey

@bryk Should this be a cherry pick candidate? It looks like 1.0.1 fixed quite a few bugs.

Yes. How do I do this?

@roberthbailey
Copy link
Contributor

See https://github.com/kubernetes/kubernetes/blob/master/docs/devel/cherry-picks.md

@k8s-github-robot
Copy link

PR changed after LGTM, removing LGTM.

@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 4, 2016
@bryk bryk added this to the v1.2 milestone Apr 4, 2016
@bryk
Copy link
Contributor

bryk commented Apr 4, 2016

LGTM

@bryk bryk added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 4, 2016

GCE e2e build/test passed for commit 7250028.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 4, 2016

GCE e2e build/test passed for commit 7250028.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 6173c43 into kubernetes:master Apr 4, 2016
@maciaszczykm maciaszczykm deleted the dashboard-release-v1.0.1 branch April 5, 2016 08:07
@roberthbailey roberthbailey added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 6, 2016
@zmerlynn zmerlynn mentioned this pull request Apr 6, 2016
Merged
zmerlynn added a commit that referenced this pull request Apr 6, 2016
@zmerlynn
Merge pull request #23937 from zmerlynn/automated-cherry-pick-of-#237…
05ff51b 
…24-upstream-release-1.2

Automated cherry pick of #23724
@zmerlynn
Copy link
Member

zmerlynn commented Apr 6, 2016

@eparis: Same question as #23776, it looks like @k8s-merge-robot doesn't want to clear my cherry picks. :)

@zmerlynn
Copy link
Member

zmerlynn commented Apr 6, 2016

@eparis: I might know what's going on, but we should chat on Slack at some point.

@eparis
Copy link
Contributor

eparis commented Apr 7, 2016

The commit message was somehow mangled in the cherrypick PR. In this PR the commit seems to have sane line breaks. In the cherry-pick PR the commit message seems to be missing a line break...

The heuristic to auto clear is based on git commit messages...

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@zmerlynn
Merge pull request kubernetes#23937 from zmerlynn/automated-cherry-pi…
adac35c 
…ck-of-#23724-upstream-release-1.2

Automated cherry pick of kubernetes#23724
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@zmerlynn
Merge pull request kubernetes#23937 from zmerlynn/automated-cherry-pi…
d1b9882 
…ck-of-#23724-upstream-release-1.2

Automated cherry pick of kubernetes#23724
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bryk bryk

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.

None yet