Merge lp:~ubuntu-branches/ubuntu/oneiric/nfs-utils/oneiric-201107171009 into lp:ubuntu/oneiric/nfs-utils

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/nfs-utils reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/nfs-utils/oneiric-201107171009. 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

41. By Steve Langasek on 2011-07-17

Drop rpc_pipefs.conf; this has gotten far more complicated than it
should be, just do the mount in-line in each of the gssd and idmapd
jobs.

40. By Steve Langasek on 2011-07-14

debian/nfs-common.idmapd.upstart: don't use a script unnecessarily for
our job when we can exec directly - making the job more resilient in
the face of races with /usr being mounted. Partially addresses
LP #643289.

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-17 02:23:01 +0000
+++ debian/changelog	2011-08-17 12:43:32 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 nfs-utils (1:1.2.2-4ubuntu8) oneiric; urgency=low
 
   * debian/nfs-common.idmapd.upstart: don't use a script unnecessarily for
@@ -9,6 +10,20 @@
 
  -- Steve Langasek <[e-mail]>  Sun, 17 Jul 2011 02:23:01 -0700
 
+=======
+nfs-utils (1:1.2.2-4ubuntu8) UNRELEASED; urgency=low
+
+  * debian/nfs-common.idmapd.upstart: don't use a script unnecessarily for
+    our job when we can exec directly - making the job more resilient in
+    the face of races with /usr being mounted.  Partially addresses
+    LP #643289.
+  * Drop rpc_pipefs.conf; this has gotten far more complicated than it
+    should be, just do the mount in-line in each of the gssd and idmapd
+    jobs.
+
+ -- Steve Langasek <[e-mail]>  Thu, 14 Jul 2011 14:41:57 -0700
+
+>>>>>>> MERGE-SOURCE
 nfs-utils (1:1.2.2-4ubuntu7) oneiric; urgency=low
 
   [ Andy Whitcroft ]