On Mon, Jun 13, 2016 at 18:34:48 +0100, Daniel P. Berrange wrote:
This bumps the release number of 2.0.0, to reflect the switch to
a new time based release versioning scheme. The downloads page
is updated to describe our policies for release schedules and
release version numbering
The stable release docs are changed to reflect the fact that
the stable version numbers are now just 3 digits long instead
of 4.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
configure.ac | 2 +-
docs/downloads.html.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++----
src/libvirt_lxc.syms | 2 +-
3 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 827d9db..0114149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public
dnl License along with this library. If not, see
dnl <
http://www.gnu.org/licenses/>.
-AC_INIT([libvirt], [1.3.6], [libvir-list(a)redhat.com], [], [
http://libvirt.org])
+AC_INIT([libvirt], [2.0.0], [libvir-list(a)redhat.com], [], [
http://libvirt.org])
AC_CONFIG_SRCDIR([src/libvirt.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
diff --git a/docs/downloads.html.in b/docs/downloads.html.in
index 13a6db1..32cc2ec 100644
--- a/docs/downloads.html.in
+++ b/docs/downloads.html.in
...
+ <ul>
+ <li><code>major</code> - incremented by 1 for the first release
of the year (the Jan 15th release)</li>
+ <li><code>minor</code> - incremented by 1 for each monthly
release from git master</li>
+ <li><code>micro</code> - always 0 for releases from git master,
incremented by 1 for each stable maintenance release</li>
+ </ul>
This should use <dl/>, i.e.,
<dl>
<dt><code>major</code></dt>
<dd>incremented by 1 for the first release of the year (the Jan
15th release)</dd>
...
</dl>
...
ACK with the above fixed and the following patch squashed.
Jirka
diff --git i/docs/formatdomain.html.in w/docs/formatdomain.html.in
index fb3ec5e..1b9eed6 100644
--- i/docs/formatdomain.html.in
+++ w/docs/formatdomain.html.in
@@ -5360,7 +5360,7 @@ qemu-kvm -net nic,model=? /dev/null
of the first forward dev will be used.
</p>
</dd>
- <dt><code>socket</code> <span class="since">since
1.3.6 (QEMU only)</span></dt>
+ <dt><code>socket</code> <span class="since">since
2.0.0 (QEMU only)</span></dt>
<dd>
<p>
This listen type tells a graphics server to listen on unix socket.
@@ -5376,7 +5376,7 @@ qemu-kvm -net nic,model=? /dev/null
attribute all <code>listen</code> elements are ignored.
</p>
</dd>
- <dt><code>none</code> <span class="since">since
1.3.6 (QEMU only)</span></dt>
+ <dt><code>none</code> <span class="since">since
2.0.0 (QEMU only)</span></dt>
<dd>
<p>
This listen type doesn't have any other attribute. Libvirt supports
diff --git i/src/libxl/libxl_driver.c w/src/libxl/libxl_driver.c
index 9e9957e..0644f60 100644
--- i/src/libxl/libxl_driver.c
+++ w/src/libxl/libxl_driver.c
@@ -5700,7 +5700,7 @@ static virHypervisorDriver libxlHypervisorDriver = {
.domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */
.nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */
.domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */
- .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 1.3.6 */
+ .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */
};
static virConnectDriver libxlConnectDriver = {
diff --git i/src/vz/vz_driver.c w/src/vz/vz_driver.c
index bb0d1b9..bb96fa0 100644
--- i/src/vz/vz_driver.c
+++ w/src/vz/vz_driver.c
@@ -2756,7 +2756,7 @@ static virHypervisorDriver vzHypervisorDriver = {
.domainIsUpdated = vzDomainIsUpdated, /* 1.2.21 */
.domainGetVcpusFlags = vzDomainGetVcpusFlags, /* 1.2.21 */
.domainGetMaxVcpus = vzDomainGetMaxVcpus, /* 1.2.21 */
- .domainSetUserPassword = vzDomainSetUserPassword, /* 1.3.6 */
+ .domainSetUserPassword = vzDomainSetUserPassword, /* 2.0.0 */
.connectDomainEventRegisterAny = vzConnectDomainEventRegisterAny, /* 1.2.10 */
.connectDomainEventDeregisterAny = vzConnectDomainEventDeregisterAny, /* 1.2.10 */
.nodeGetCPUMap = vzNodeGetCPUMap, /* 1.2.8 */