bump version to 3.0-14, add new value (html5) for console settings

diff --git a/Makefile b/Makefile
index 17afcbf948e964a0a561eb73296db4c3164f7ee8..8a061b9de94e3122ca90ec39d86dc0577258eaa7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=3.2
 
 PACKAGE=pve-cluster
 PKGVER=3.0
-PKGREL=13
+PKGREL=14
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)

diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index 22e40e27bff205e7d96289770bfde225f81a3985..f679693eb45498694c7474e178e2d709011a1fc6 100644 (file)
--- a/data/PVE/Cluster.pm
+++ b/data/PVE/Cluster.pm
@@ -1261,8 +1261,8 @@ my $datacenter_schema = {
        console => {
            optional => 1,
            type => 'string',
-           description => "Select the default Console viewer. You can either use the builtin java applet (VNC), or an external virt-viewer comtatible application (SPICE).",
-           enum => ['applet', 'vv'],
+           description => "Select the default Console viewer. You can either use the builtin java applet (VNC), an external virt-viewer comtatible application (SPICE), or an HTML5 based viewer (noVNC).",
+           enum => ['applet', 'vv', 'html5'],
        },
     },
 };

diff --git a/debian/changelog b/debian/changelog
index c10d05201f54bc8fc22418137e786886ae6ae057..401aedf150a5229be96a09825fd5dda43e316ce3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-cluster (3.0-14) unstable; urgency=low
+
+  * datacenter.cfg: add new value for console setting (html5)
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 25 Jun 2014 06:22:58 +0200
+
 pve-cluster (3.0-13) unstable; urgency=low
 
   * fix bug 204: use DERIVE instead of COUNTER