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@redhat.com> --- configure.ac | 2 +- docs/downloads.html.in | 51 +++++++++++++++++++++++++++++++++++++++++++---- docs/formatdomain.html.in | 6 +++--- src/libvirt_lxc.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 6 files changed, 54 insertions(+), 11 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@redhat.com], [], [http://libvirt.org]) +AC_INIT([libvirt], [2.0.0], [libvir-list@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..899671a 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -32,20 +32,63 @@ <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> </ul> + <h2><a name="schedule">Primary release schedule</a></h2> + + <p> + Libvirt follows a time based plan, with releases made once a month + on the 1st of each month give or take a few days. The only exception + is at the start of the year where there are two 6 weeks gaps (first + release in the middle of Jan, then skip the Feb release), giving + a total of 11 releases a year. + </p> + + <h2><a name="numbering">Release numbering</a></h2> + + <p> + Since libvirt 2.0.0, a time based version numbering rule + is applied. As such, the changes in version number have + do not have any implications with respect to the scope of + features or bugfixes included, the stability of the code, + or the API / ABI compatibility (libvirt API / ABI is guaranteed + stable forever). The rules applied for changing the libvirt + version number are: + </p> + + <dl> + <dt>major</dt> + <dd>incremented by 1 for the first release of the year (the + Jan 15th release)</dd> + <dt>minor</dt> + <dd>incremented by 1 for each monthly release from git master</dd> + <dt>micro</dt> + <dd>always 0 for releases from git master, incremented by 1 + for each stable maintenance release</dd> + </dl> + + <p> + Prior to 2.0.0, the major/minor numbers were incremented + fairly arbitrarily, and maintenance releases appended a + fourth digit. + </p> + <h2><a name="maintenance">Maintenance releases</a></h2> <p> In the git repository are several stable maintenance branches, matching the - pattern <code>v<i>major</i>.<i>minor</i>.<i>micro</i>-maint</code>; + pattern <code>v<i>major</i>.<i>minor</i>-maint</code>; these branches are forked off the corresponding - <code>v<i>major</i>.<i>minor</i>.<i>micro</i></code> formal + <code>v<i>major</i>.<i>minor</i>.0</code> formal release, and may have further releases of the - form <code>v<i>major</i>.<i>minor</i>.<i>micro</i>.<i>rel</i></code>. + form <code>v<i>major</i>.<i>minor</i>.<i>micro</i></code>. These maintenance branches should only contain bug fixes, and no new features, backported from the master branch, and are supported as long as at least one downstream distribution expresses interest in a given branch. These maintenance - branches are considered during CVE analysis. + branches are considered during CVE analysis. In contrast + to the primary releases which are made once a month, there + is no formal schedule for the maintenance releases, which + are made whenever there is a need to make available key + bugfixes to downstream consumers. </p> <p> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0ad2bbc..daa0891 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2574,7 +2574,7 @@ if <code>discard</code> is set to "ignore"). NB enabling the detection is a compute intensive operation, but can save file space and/or time on slow media. - <span class='since'>Since 1.3.6</span> + <span class='since'>Since 2.0.0</span> </li> <li> The optional <code>iothread</code> attribute assigns the @@ -5372,7 +5372,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. @@ -5388,7 +5388,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 a/src/libvirt_lxc.syms b/src/libvirt_lxc.syms index 56c24c0..9b418ee 100644 --- a/src/libvirt_lxc.syms +++ b/src/libvirt_lxc.syms @@ -21,7 +21,7 @@ LIBVIRT_LXC_1.0.4 { virDomainLxcEnterSecurityLabel; } LIBVIRT_LXC_1.0.2; -LIBVIRT_LXC_1.3.6 { +LIBVIRT_LXC_2.0.0 { global: virDomainLxcEnterCGroup; } LIBVIRT_LXC_1.0.4; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9e9957e..0644f60 100644 --- a/src/libxl/libxl_driver.c +++ b/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 a/src/vz/vz_driver.c b/src/vz/vz_driver.c index bb0d1b9..bb96fa0 100644 --- a/src/vz/vz_driver.c +++ b/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 */ -- 2.5.5