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

Fix strategic merge diff list diff bug #26418

Merged
merged 1 commit into from
May 30, 2016
Merged

Fix strategic merge diff list diff bug #26418

merged 1 commit into from
May 30, 2016
+1 −1

Conversation

adohe-zz
Copy link

@adohe-zz adohe-zz mentioned this pull request May 27, 2016
Closed
@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 May 27, 2016
@k8s-bot
Copy link

k8s-bot commented May 27, 2016

GCE e2e build/test passed for commit 04c0103.

@janetkuo janetkuo assigned janetkuo and unassigned thockin May 27, 2016
@janetkuo janetkuo added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels May 27, 2016
@janetkuo
Copy link
Member

@adohe thanks; could you add a test to catch this bug also?

@adohe-zz
Copy link
Author

@janetkuo sure, I will.

@janetkuo janetkuo added this to the v1.3 milestone May 27, 2016
@janetkuo janetkuo added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2016
@janetkuo
Copy link
Member

I want to get this fix merged. @adohe please send a follow-up PR for the test, thanks!

@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 May 30, 2016

GCE e2e build/test passed for commit 04c0103.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 1958427 into kubernetes:master May 30, 2016
@adohe-zz adohe-zz deleted the kubectl_env branch May 30, 2016 03:21
This was referenced May 30, 2016
Merged
Closed
@adohe-zz adohe-zz mentioned this pull request Jun 8, 2016
Closed
@adohe-zz adohe-zz mentioned this pull request Jun 9, 2016
Merged
@bgrant0607 bgrant0607 added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jun 10, 2016
@bgrant0607 bgrant0607 changed the title fix strategy patch diff list issue Fixed strategic merge diff list diff bug Jun 10, 2016
@bgrant0607 bgrant0607 changed the title Fixed strategic merge diff list diff bug Fix strategic merge diff list diff bug Jun 10, 2016
@roberthbailey roberthbailey added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jun 21, 2016
roberthbailey added a commit that referenced this pull request Jun 21, 2016
@roberthbailey
Merge pull request #27113 from AdoHe/automated-cherry-pick-of-#26418-…
a5845a4 
…upstream-release-1.2

Automated cherry pick of #26418
k8s-github-robot pushed a commit that referenced this pull request Aug 16, 2016
Merge pull request #26510 from AdoHe/patch_test
096dd4d 
Automatic merge from submit-queue

update strategic patch test for merge list of maps

Refer #26418 for more details. @janetkuo the test case is added, ptal.
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#27113 from AdoHe/automated-cherry-pick-…
00dcea5 
…of-#26418-upstream-release-1.2

Automated cherry pick of kubernetes#26418
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@roberthbailey
Merge pull request kubernetes#27113 from AdoHe/automated-cherry-pick-…
51b0a9b 
…of-#26418-upstream-release-1.2

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

@janetkuo janetkuo

Labels
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.

Environment variables named specific things not getting passed on from deployment to pods
10 participants
@adohe-zz @k8s-bot @janetkuo @k8s-github-robot @googlebot @thockin @bgrant0607 @roberthbailey @eparis @adohe