From 66a15f277ec0dba82066644a9ed26b76c46284a4 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 25 Jun 2014 06:23:47 +0200 Subject: [PATCH] bump version to 3.0-14, add new value (html5) for console settings --- Makefile | 2 +- data/PVE/Cluster.pm | 4 ++-- debian/changelog | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 17afcbf..8a061b9 100644 --- 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 22e40e2..f679693 100644 --- 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 c10d052..401aedf 100644 --- 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 Wed, 25 Jun 2014 06:22:58 +0200 + pve-cluster (3.0-13) unstable; urgency=low * fix bug 204: use DERIVE instead of COUNTER -- 2.39.2