commit b7301a28a60728ee48d752053e01762b7282f440
Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
Date:   Mon May 8 17:53:27 2017 -0700

    reconstruct-changelog

diff --git a/debian/changelog b/debian/changelog
index 40ea116..f23b21f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,57 @@
+open-iscsi (2.0.874-2ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests: Add Ubuntu autopkgtest.
+      + Includes tests to verify net-interface-handler is installed
+        executable, and one to actually test that /etc/resolv.conf is
+        updated with dhcp dns responses.
+      + debian/tests/control: add build-needed since some of the new
+        tests appear to require that (so they can reach open-iscsi.deb
+        which is a build artifact from building in autopkgtest).
+      + debian/tests/test-open-iscsi.py: install the open-iscsi binary
+        into a test cloud image, so we can check bootability. Download the
+        open-iscsi explicitly to /tmp before trying to copy it; so that
+        we don't need to depend on ugly internal autopkgtest paths.
+      + debian/tests/tgt-boot-test: set HOST_IP to 10.0.2.2; it's
+        suboptimal but given the test setup this will allow the right
+        IPs to be used to bring up the iscsi target in the xkvm.
+      + only run test on amd64. just avoid timeout errors or other unrelated
+        issues causing failure.
+      + debian/tests/README-boot-test.md: add doc describing the tgt-boot-test
+    - debian/iscsi-network-interface.rules, debian/net-interface-handler,
+      debian/open-iscsi.install:
+      Prevent network interface that contains iscsi root from bouncing
+      during boot or going down during shutdown.
+      Integrates with resolvconf and initramfs code that writes
+      /run/initramfs/open-iscsi.interface
+    - debian/open-iscsi.maintscript: clean up the obsolete
+      iscsi-network-interface upstart job, file on upgrade.
+    - add IPv6 support
+      + add support for IPV6{DOMAINSEARCH,DNS0,DNS1} to net-interface-handler
+        LP #1621507
+      + Source /run/net6-*.conf when needed.
+      + debian/extra/initramfs.local-top: handle IPv6 configs being
+        shipped in DEVICE6 or /run/net6-*.conf in the initramfs, so we
+        can fill in /run/initramfs/open-iscsi.interface (LP #1621507)
+  * Drop:
+    - Make systemd job not run in containers (LP #1576341)
+      [ This prevents running iscsi in privileged containers.
+        Fixed differently in this upload. ]
+    - Cherry-pick from Debian git repository (Christian Seiler):
+      + open-iscsi-udeb: drop Depends: libnss-files-udeb
+        (Closes #819685)
+      [ Fixed in Debian ]
+     - d/extra/initramfs.local-top whitespace change
+     [ previously undocumented ]
+  [ Balint Reczey ]
+  * Let iscsid systemd job run in privileged containers but not in
+    unprivileged ones
+  * Start open-iscsi systemd job when either /etc/iscsi/nodes or
+    /sys/class/iscsi_session have content
+    Based on patch by Nish Aravamudan, thanks! (LP #1576341)
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Mon, 08 May 2017 17:53:27 -0700
+
 open-iscsi (2.0.874-2) unstable; urgency=medium
 
   [ Christian Seiler ]