Merge lp://staging/~ubuntu-branches/ubuntu/quantal/lxc/quantal-201209062137 into lp://staging/ubuntu/quantal/lxc
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/quantal/lxc/quantal-201209062137 |
| Merge into: | lp://staging/ubuntu/quantal/lxc |
| Diff against target: |
27328 lines (+26999/-0) (has conflicts) 48 files modified
.pc/0206-lxc-wait-initialize-timeout/src/lxc/lxc_wait.c (+99/-0) .pc/0207-ubuntu-cloud-fixes.patch/templates/lxc-ubuntu-cloud.in (+401/-0) .pc/0208-fix-getitem-utsname-segv/src/lxc/conf.c (+2467/-0) .pc/0208-fix-getitem-utsname-segv/src/lxc/confile.c (+1670/-0) .pc/0209-reload-conf-after-create/src/lxc/conf.c (+2467/-0) .pc/0209-reload-conf-after-create/src/lxc/conf.h (+261/-0) .pc/0209-reload-conf-after-create/src/lxc/lxccontainer.c (+917/-0) .pc/0210-fix-debian-templates/templates/lxc-debian.in (+341/-0) .pc/0210-fix-debian-templates/templates/lxc-lenny.in (+318/-0) .pc/0211-add-hooks-to-manpage/doc/lxc.conf.sgml.in (+797/-0) .pc/0212-lxc-destroy-rm-symlink/src/lxc/lxc-destroy.in (+126/-0) .pc/0213-add-premount-hook.patch/doc/lxc.conf.sgml.in (+876/-0) .pc/0213-add-premount-hook.patch/src/lxc/conf.c (+2485/-0) .pc/0213-add-premount-hook.patch/src/lxc/conf.h (+262/-0) .pc/0213-add-premount-hook.patch/src/lxc/confile.c (+1670/-0) .pc/compilecleanups/0001-replace-HOOK-define-with-proper-code.patch/src/lxc/conf.c (+2464/-0) .pc/compilecleanups/0001-replace-HOOK-define-with-proper-code.patch/src/lxc/conf.h (+266/-0) .pc/compilecleanups/0001-replace-HOOK-define-with-proper-code.patch/src/lxc/start.c (+849/-0) .pc/compilecleanups/0002-add-prototype-for-clone-2-as-per-manpage.patch/src/lxc/namespace.h (+56/-0) .pc/compilecleanups/0003-check-chdir-return-value.patch/src/lxc/lxccontainer.c (+914/-0) .pc/compilecleanups/0004-Fix-passing-non-const-char-in-for-const-char.patch/src/lxc/lxc.h (+210/-0) .pc/compilecleanups/0004-Fix-passing-non-const-char-in-for-const-char.patch/src/lxc/lxc_wait.c (+100/-0) .pc/compilecleanups/0004-Fix-passing-non-const-char-in-for-const-char.patch/src/lxc/lxccontainer.c (+917/-0) .pc/compilecleanups/0004-Fix-passing-non-const-char-in-for-const-char.patch/src/lxc/lxccontainer.h (+71/-0) .pc/compilecleanups/0004-Fix-passing-non-const-char-in-for-const-char.patch/src/tests/containertests.c (+257/-0) .pc/compilecleanups/0005-return-nonvoid/src/lxc/conf.c (+2467/-0) .pc/compilecleanups/0006-unused-var/src/lxc/confile.c (+1670/-0) .pc/compilecleanups/0006-unused-var/src/lxc/lxc_wait.c (+100/-0) .pc/compilecleanups/0006-unused-var/src/tests/getkeys.c (+71/-0) .pc/compilecleanups/0007-tests-check-return-values/src/tests/containertests.c (+257/-0) .pc/compilecleanups/0007-tests-check-return-values/src/tests/startone.c (+202/-0) debian/changelog (+37/-0) debian/hooks/mountecryptfsroot (+53/-0) debian/patches/0206-lxc-wait-initialize-timeout (+18/-0) debian/patches/0207-ubuntu-cloud-fixes.patch (+165/-0) debian/patches/0208-fix-getitem-utsname-segv (+17/-0) debian/patches/0209-reload-conf-after-create (+92/-0) debian/patches/0210-fix-debian-templates (+27/-0) debian/patches/0211-add-hooks-to-manpage (+94/-0) debian/patches/0212-lxc-destroy-rm-symlink (+28/-0) debian/patches/0213-add-premount-hook.patch (+80/-0) debian/patches/compilecleanups/0001-replace-HOOK-define-with-proper-code.patch (+85/-0) debian/patches/compilecleanups/0002-add-prototype-for-clone-2-as-per-manpage.patch (+28/-0) debian/patches/compilecleanups/0003-check-chdir-return-value.patch (+29/-0) debian/patches/compilecleanups/0004-Fix-passing-non-const-char-in-for-const-char.patch (+77/-0) debian/patches/compilecleanups/0005-return-nonvoid (+13/-0) debian/patches/compilecleanups/0006-unused-var (+48/-0) debian/patches/compilecleanups/0007-tests-check-return-values (+80/-0) Conflict adding file .pc/0206-lxc-wait-initialize-timeout. Moved existing file to .pc/0206-lxc-wait-initialize-timeout.moved. Conflict adding file .pc/0207-ubuntu-cloud-fixes.patch. Moved existing file to .pc/0207-ubuntu-cloud-fixes.patch.moved. Conflict adding file .pc/0208-fix-getitem-utsname-segv. Moved existing file to .pc/0208-fix-getitem-utsname-segv.moved. Conflict adding file .pc/0209-reload-conf-after-create. Moved existing file to .pc/0209-reload-conf-after-create.moved. Conflict adding file .pc/0210-fix-debian-templates. Moved existing file to .pc/0210-fix-debian-templates.moved. Conflict adding file .pc/0211-add-hooks-to-manpage. Moved existing file to .pc/0211-add-hooks-to-manpage.moved. Conflict adding file .pc/0212-lxc-destroy-rm-symlink. Moved existing file to .pc/0212-lxc-destroy-rm-symlink.moved. Conflict adding file .pc/0213-add-premount-hook.patch. Moved existing file to .pc/0213-add-premount-hook.patch.moved. Conflict adding file .pc/compilecleanups. Moved existing file to .pc/compilecleanups.moved. Text conflict in debian/changelog Conflict adding file debian/hooks/mountecryptfsroot. Moved existing file to debian/hooks/mountecryptfsroot.moved. Conflict adding file debian/patches/0206-lxc-wait-initialize-timeout. Moved existing file to debian/patches/0206-lxc-wait-initialize-timeout.moved. Conflict adding file debian/patches/0207-ubuntu-cloud-fixes.patch. Moved existing file to debian/patches/0207-ubuntu-cloud-fixes.patch.moved. Conflict adding file debian/patches/0208-fix-getitem-utsname-segv. Moved existing file to debian/patches/0208-fix-getitem-utsname-segv.moved. Conflict adding file debian/patches/0209-reload-conf-after-create. Moved existing file to debian/patches/0209-reload-conf-after-create.moved. Conflict adding file debian/patches/0210-fix-debian-templates. Moved existing file to debian/patches/0210-fix-debian-templates.moved. Conflict adding file debian/patches/0211-add-hooks-to-manpage. Moved existing file to debian/patches/0211-add-hooks-to-manpage.moved. Conflict adding file debian/patches/0212-lxc-destroy-rm-symlink. Moved existing file to debian/patches/0212-lxc-destroy-rm-symlink.moved. Conflict adding file debian/patches/0213-add-premount-hook.patch. Moved existing file to debian/patches/0213-add-premount-hook.patch.moved. Conflict adding file debian/patches/compilecleanups. Moved existing file to debian/patches/compilecleanups.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/quantal/lxc/quantal-201209062137 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/lxc reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/lxc/quantal-201209062137. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 162. By Serge Hallyn
-
fix example ecryptfs hook
- 161. By Serge Hallyn
-
add example ecryptfs hook
- 160. By Serge Hallyn
-
0213-add-
premount- hook.patch: add a premount hook to support encrypted
filesystems. (LP: #1043052) - 159. By Stéphane Graber
-
Make iptables call more consistent
- 158. By Serge Hallyn
-
0212-lxc-
destroy- rm-symlink: If rootfs is a symbolic link to a directory,
remove it. - 157. By Serge Hallyn
-
0211-add-
hooks-to- manpage: document lxc.hook in the lxc.conf manpage. - 156. By Stéphane Graber
-
Add Debian template fixes
- 155. By Serge Hallyn
-
not complete - fix one more out of 3 errors
- 154. By Serge Hallyn
-
fix typo
- 153. By Serge Hallyn
-
0209-reload-
conf-after- create: add ability to free a lxc_conf. Use that
after calling Container->Create() to completely reload the newly created
config.
