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

make Alpine template more POSIX shell friendly #1498 #1503

Closed
wants to merge 1 commit into from
Closed

make Alpine template more POSIX shell friendly #1498 #1503

wants to merge 1 commit into from

Conversation

BegBlev
Copy link
Contributor

@BegBlev BegBlev commented Apr 10, 2017

This is a cherry-picked backport from pull-request #1500 related to bug #1498

Regards
Vincent

Signed-off-by: Vincent Catros <vincent.catros@laposte.net>
(cherry picked from commit 7276799)
@lxc-jenkins
Copy link

This pull request didn't trigger Jenkins as its author isn't in the whitelist.

An organization member must perform one of the following:

  • To have this branch tested by Jenkins, use the "ok to test" command.
  • To have a one time test done, use the "test this please" command.

Those commands are simple Github comments of the format: "jenkins: COMMAND"

@BegBlev
Copy link
Contributor Author

BegBlev commented Apr 10, 2017

Hi,

I don't understand why I got this "Branch target is incorrect" message.
3 days ago I proposed pull request #1500 solving bug #1498 . This pull-request was accepted.
Now, I would like backport this bug correction to stable-2.0 which is straight forward.
I tried to "cherry-pick" the bug correction but I probably missed something.

What I have done:

  • git checkout stable-2.0
  • git checkout -b 1498-backport (to create a new branch based on stable-2.0)
  • git cherry-pick -x 7276799 (to apply the change to my new branch)
  • git push origin 1498-backport (to push my new branch to my own fork)
  • on Github website I asked for this current pull-request indicating lxc:stable-2.0 as the version I want to apply the change to.

What I have done wrong?

Best regards.
Vincent

@stgraber
Copy link
Member

You usually don't need to send pull requests for changes to stable-2.0, all fixes that go in master get backported regularly.

@BegBlev
Copy link
Contributor Author

BegBlev commented Apr 11, 2017

Thank you Stéphane,

I didn't knew that.
So I suppose I can close this pull request.

Best regards
Vince

@BegBlev BegBlev closed this Apr 11, 2017
@BegBlev BegBlev deleted the 1498-backport branch April 11, 2017 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants