Merge lp:~ubuntu-branches/ubuntu/trusty/util-linux/trusty-201401201808 into lp:ubuntu/trusty/util-linux

[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/trusty/util-linux reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/util-linux/trusty-201401201808. 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

102. By Martin Pitt on 2014-01-20

debian/fstrim-all: Ignore instead of failing on non-existing devices, such
as /dev/mapper/* in containers backed by LVM.

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-20 17:46:34 +0000
+++ debian/changelog	2014-01-20 18:17:24 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 util-linux (2.20.1-5.1ubuntu14) trusty; urgency=medium
 
   * debian/fstrim-all: Ignore instead of failing on non-existing devices, such
@@ -10,6 +11,15 @@
 
  -- Martin Pitt <[e-mail]>  Mon, 20 Jan 2014 17:46:34 +0100
 
+=======
+util-linux (2.20.1-5.1ubuntu14) UNRELEASED; urgency=medium
+
+  * debian/fstrim-all: Ignore instead of failing on non-existing devices, such
+    as /dev/mapper/* in containers backed by LVM.
+
+ -- Martin Pitt <[e-mail]>  Mon, 20 Jan 2014 15:57:05 +0100
+
+>>>>>>> MERGE-SOURCE
 util-linux (2.20.1-5.1ubuntu13) trusty; urgency=medium
 
   * debian/rules: follow powerpc/ppc64 conditional path for ppc64el too.

=== modified file 'debian/fstrim-all'