bump version to 4.2-6

diff --git a/Makefile b/Makefile
index 93af3ea97032e45a6718394e09c290507a02a61d..7764fcf2fcff07c568068d8db27a7c30e7804627 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ GEN_PACKAGE=pve-doc-generator
 DOC_PACKAGE=pve-docs
 
 # also update debian/changelog
-PKGREL=5
+PKGREL=6
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 

diff --git a/debian/changelog b/debian/changelog
index 04d38499cde9757c55238e084d546e874e75ff20..c871ee77bce163010a8e1e5f6a808509a9cea46a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+pve-docs (4.2-6) unstable; urgency=medium
+
+  * doc: update stdexcludes
+
+  * add note about skipped bind/dev mps
+
+  * add bind mount warning
+
+  * Document CPU and Memory Input panel
+
+  * add paragraph for IO Thread option
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Jun 2016 12:36:43 +0200
+
 pve-docs (4.2-5) unstable; urgency=medium
 
   * fix package build system (single debian dir)