release: bump version to 1.21.1-dev after 1.20.0 release

System Internals / NetworkManager - Thomas Haller [redhat.com] - 6 August 2019 11:01 EDT



###

release: bump version to 1.21.1-dev after 1.20.0 release

After 1.20.0 is released, merge it back into master so that
1.20.0 is part of the history of master. That means,
$ git log --first-parent master
will also traverse 1.20.0 and 1.20-rc*.

Also bump the micro version to 1.21.1-dev to indicate that this is
after 1.20.0 is out.


diff --cc configure.ac
index 2d0e92522,194fd0d6d..951f51b9a
--- a/configure.ac
+++ b/configure.ac
@@@ -7,8 -7,8 +7,8 @@@ dnl - add corresponding NM_VERSION_x_y
dnl "shared/nm-version-macros.h.in"
dnl - update number in meson.build
m4_define([nm_major_version], [1])
- m4_define([nm_minor_version], [20])
- m4_define([nm_micro_version], [0])
+ m4_define([nm_minor_version], [21])
-m4_define([nm_micro_version], [0])
++m4_define([nm_micro_version], [1])
m4_define([nm_version],
[nm_major_version.nm_minor_version.nm_micro_version])

diff --cc meson.build
index efad8426b,01b1d15ff..9fc9ad268
--- a/meson.build
+++ b/meson.build
@@@ -4,7 -4,7 +4,7 @@@ project
# - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in"
# - update number in configure.ac
- version: '1.20.0',
- version: '1.21.0',
++ version: '1.21.1',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',

96339fa5e release: bump version to 1.21.1-dev after 1.20.0 release

clients/cli/connections.c | 47 ++--
clients/cli/devices.c | 257 +++++++++++++--------
clients/cli/nmcli.h | 5 -
.../test-client.check-on-disk/test_003.expected | 36 +--
clients/tests/test-client.py | 2 +-
configure.ac | 4 +-
data/meson.build | 2 -
dispatcher/meson.build | 1 -
libnm-core/nm-setting-ip-config.c | 9 +-
libnm-core/nm-version.h | 14 ++
libnm-core/tests/test-setting.c | 4 +-
libnm/meson.build | 2 +-
meson.build | 2 +-
shared/meson.build | 24 +-
shared/nm-utils/tests/meson.build | 22 ++
shared/nm-version-macros.h.in | 1 +
src/devices/nm-device-bond.c | 10 +-
src/devices/nm-device-bridge.c | 10 +-
src/devices/team/nm-device-team.c | 10 +-
src/meson.build | 3 +-
20 files changed, 260 insertions(+), 205 deletions(-)

Upstream: cgit.freedesktop.org


  • Share