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

confile: add lxc.hook.version #2026

Merged
merged 7 commits into from
Dec 14, 2017
Merged

Conversation

brauner
Copy link
Member

@brauner brauner commented Dec 12, 2017

Unblocks #2015.
Closes #1766.

Signed-off-by: Christian Brauner christian.brauner@ubuntu.com


<listitem>
<para>
LXC_HOOK_SECTION: the section type 'net'.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing whitespace :(

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@flx42
Copy link
Contributor

flx42 commented Dec 12, 2017

Tested with #2015, seems to work as expected :)

@hallyn
Copy link
Member

hallyn commented Dec 14, 2017

Looks good to me.

It conflicts with the 'lxc.proc' patchset though. Once that's resolved +1 from me
on merging, or you can ping me to merge.

Christian Brauner added 2 commits December 14, 2017 11:47
Unblocks lxc#2013.
Unblocks lxc#2015.
Closes lxc#1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This can be used by scripts to detect what version of the hooks are used.

Unblocks lxc#2013.
Unblocks lxc#2015.
Closes lxc#1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner added 3 commits December 14, 2017 11:52
Unblocks lxc#2013.
Unblocks lxc#2015.
Closes lxc#1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Unblocks lxc#2013.
Unblocks lxc#2015.
Closes lxc#1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Unblocks lxc#2013.
Unblocks lxc#2015.
Closes lxc#1766.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
@brauner
Copy link
Member Author

brauner commented Dec 14, 2017

@hallyn, ready to merge. :)

@brauner
Copy link
Member Author

brauner commented Dec 14, 2017

Something about the patch seems wrong according to the test suite.

Christian Brauner added 2 commits December 14, 2017 14:41
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
@brauner
Copy link
Member Author

brauner commented Dec 14, 2017

@hallyn, ok. Now it's ready to go. :)

@hallyn hallyn merged commit 81b10e3 into lxc:master Dec 14, 2017
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.

3 participants