Merge lp:~ubuntu-branches/ubuntu/oneiric/cobbler-enlist/oneiric-201109291911 into lp:ubuntu/oneiric/cobbler-enlist

[Ubuntu Package Importer]

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/oneiric/cobbler-enlist reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/cobbler-enlist/oneiric-201109291911. 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://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

5. By Dave Walker on 2011-09-27

debian/cobbler-enlist-udeb.templates: Updated halt-note template to warn
of poweroff, and brief guidance how to proceed.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-28 00:43:36 +0000
+++ debian/changelog	2011-09-29 19:17:29 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 cobbler-enlist (0.2-1) oneiric; urgency=low
 
   * debian/cobbler-enlist-udeb.templates: Updated warning-note template to 
@@ -9,6 +10,15 @@
 
  -- Dave Walker (Daviey) <[e-mail]>  Wed, 28 Sep 2011 00:43:36 +0100
 
+=======
+cobbler-enlist (0.1-3) UNRELEASED; urgency=low
+
+  * debian/cobbler-enlist-udeb.templates: Updated halt-note template to warn
+    of poweroff, and brief guidance how to proceed.
+
+ -- Dave Walker (Daviey) <[e-mail]>  Tue, 27 Sep 2011 13:19:24 +0100
+
+>>>>>>> MERGE-SOURCE
 cobbler-enlist (0.1-2) oneiric; urgency=low
 
   * debian/control: Bumped menu item number to 2350, inserting enlist to the

=== modified file 'debian/cobbler-enlist-udeb.templates'
--- debian/cobbler-enlist-udeb.templates	2011-09-28 00:43:36 +0000
+++ debian/cobbler-enlist-udeb.templates	2011-09-29 19:17:29 +0000
@@ -33,6 +33,7 @@
 Template: cobbler-enlist/warning-note
 Type: note
 Default: false
+<<<<<<< TREE
 _Description: Cobbler Enlistment
  This process requires that you have an existing Ubuntu Orchestra 
  Provisioning service.
@@ -47,3 +48,12 @@
  Juju.
  .
  NOTE: this information is currently submitted unencrypted.
+=======
+_Description: System will now turn off
+ The enlistment request has been sent to the Orchestra
+ (Cobbler) server, and therefore your system will now
+ turn off.
+ .
+ The system can be installed and deployed via cobbler
+ or juju.
+>>>>>>> MERGE-SOURCE