From 2912fa7a43b8f7fdc3f13b4e77041833413232f3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 15 Dec 2014 22:45:35 +0000
Subject: [PATCH] Version 1.29.17.

---
 AUTHORS                     |  1 +
 BUGS                        | 22 +++++++++++-----------
 configure.ac                |  2 +-
 po-docs/libguestfs-docs.pot |  4 ++--
 po/libguestfs.pot           |  4 ++--
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 19f507315..b32a27f90 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Douglas Schilling Landgraf
 Eric Blake
 Erik Nolte
 Evaggelos Balaskas
+Gabriele Cerami
 Geert Warrink
 Guido Günther
 Hilko Bengen
diff --git a/BUGS b/BUGS
index b5b6e4e09..d9450eeaa 100644
--- a/BUGS
+++ b/BUGS
@@ -539,10 +539,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1160203 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1160203
   log of virt-sysprep contains only the output of the last script
 
-1167774 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=1167774
-  virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
-
-(174 bugs)
+(173 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -554,15 +551,12 @@ You can help by testing the fixes.
 1122557 POST https://bugzilla.redhat.com/show_bug.cgi?id=1122557
   virt-sparsify overwrites block devices if used as output files
 
-1167601 POST https://bugzilla.redhat.com/show_bug.cgi?id=1167601
-  "Conversion was successful" pop out even virt-p2v fails
-
-1174123 POST https://bugzilla.redhat.com/show_bug.cgi?id=1174123
-  Graphics password disappear after conversion of virt-v2v
-
 1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
   Recommended default clock/timer settings
 
+1167601 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1167601
+  "Conversion was successful" pop out even virt-p2v fails
+
 1020950 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1020950
   CVE-2013-4419 libguestfs: insecure temporary directory handling for guestfish's network socket [epel-5]
 
@@ -584,7 +578,13 @@ You can help by testing the fixes.
 1165569 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1165569
   Disable "cancel conversion" button after virt-p2v conversion finished
 
-(12 bugs)
+1167774 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1167774
+  virt-p2v fails with error:"nbd.c:nbd_receive_negotiate():L501: read failed"
+
+1174123 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1174123
+  Graphics password disappear after conversion of virt-v2v
+
+(13 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
diff --git a/configure.ac b/configure.ac
index eefb67eb8..6b32461fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [29])
-m4_define([libguestfs_release], [16])
+m4_define([libguestfs_release], [17])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index d96743e8f..eddb7a5ef 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.29.16\n"
+"Project-Id-Version: libguestfs 1.29.17\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2014-12-15 18:01+0000\n"
+"POT-Creation-Date: 2014-12-15 22:43+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 80e6fda27..72b01e17f 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.29.16\n"
+"Project-Id-Version: libguestfs 1.29.17\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-12-15 18:01+0000\n"
+"POT-Creation-Date: 2014-12-15 22:43+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"