release: bump version to 1.23.1-dev after 1.22.0 release

System Internals / NetworkManager - Thomas Haller [redhat.com] - 17 December 2019 08:58 UTC



###

release: bump version to 1.23.1-dev after 1.22.0 release

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

Also bump the micro version to 1.23.1-dev to indicate that this is
after 1.22.0 is out.


diff --cc NEWS
index 2247f7741,7b6d11445..c503c5023
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,13 +1,20 @@@
+ =============================================
-NetworkManager-1.22
-Overview of changes since NetworkManager-1.20
++NetworkManager-1.24
++Overview of changes since NetworkManager-1.22
+ =============================================
+
-This is a snapshot of NetworkManager 1.22 development series.
++This is a snapshot of NetworkManager 1.24 development series.
+ The API is subject to change and not guaranteed to be compatible
+ with the later release.
+ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
+
+=============================================
+NetworkManager-1.22
+Overview of changes since NetworkManager-1.20
+=============================================
+
+This is a new stable release of NetworkManager. Notable changes include:
+
* Drop support for BlueZ 4. BlueZ 5 was released in 2012 and should
nowadays be available everywhere.
* DHCP: switch "internal" DHCPv4 plugin from code based on systemd to use nettools'
diff --cc configure.ac
index 257937777,4889c536a..24b3f7c43
--- 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], [22])
- m4_define([nm_micro_version], [0])
+ m4_define([nm_minor_version], [23])
-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 0af69f35d,f02bf954a..136b8a383
--- 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.22.0',
- version: '1.23.0',
++ version: '1.23.1',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',

bc2ca6e60 release: bump version to 1.23.1-dev after 1.22.0 release

.gitignore | 3 +-
Makefile.am | 56 +-
NEWS | 10 +
clients/cli/common.c | 17 +-
clients/cli/connections.c | 2 +-
clients/cli/devices.c | 16 +-
clients/cli/general.c | 140 ++-
clients/cli/meson.build | 2 +-
clients/cloud-setup/main.c | 76 +-
clients/cloud-setup/meson.build | 13 +-
clients/cloud-setup/nm-cloud-setup-utils.c | 8 +-
clients/common/nm-meta-setting-desc.c | 2 +-
clients/common/nm-secret-agent-simple.c | 2 +-
clients/common/settings-docs.h.in | 6 +-
clients/meson.build | 11 +-
clients/nm-online.c | 20 +-
.../test-client.check-on-disk/test_001.expected | 1016 ++++++++++----------
clients/tui/meson.build | 1 +
clients/tui/nm-editor-bindings.c | 9 +
clients/tui/nmt-page-wifi.c | 1 +
clients/tui/nmtui.c | 9 +-
config.h.meson | 4 +
configure.ac | 31 +-
libnm-core/nm-core-internal.h | 9 -
libnm-core/nm-dbus-interface.h | 84 ++
libnm-core/nm-dbus-utils.c | 46 -
libnm-core/nm-setting-connection.c | 27 +-
libnm-core/nm-setting-wireless-security.c | 10 +-
libnm-core/nm-setting-wireless.c | 7 +-
libnm-core/nm-utils.c | 11 +
libnm-core/nm-utils.h | 2 +
libnm-core/nm-version.h | 14 +
libnm/libnm.ver | 7 +
libnm/meson.build | 18 +
libnm/nm-client.c | 276 ++++--
libnm/nm-client.h | 107 +--
libnm/nm-libnm-utils.c | 86 +-
libnm/nm-libnm-utils.h | 8 +-
libnm/nm-secret-agent-old.c | 6 +-
libnm/tests/test-libnm.c | 45 +
libnm/tests/test-remote-settings-client.c | 4 +-
man/NetworkManager.conf.xml | 2 +
meson.build | 16 +-
shared/meson.build | 18 +-
shared/nm-glib-aux/nm-shared-utils.c | 12 +-
shared/nm-glib-aux/nm-shared-utils.h | 17 +-
shared/nm-glib-aux/nm-time-utils.c | 82 +-
shared/nm-glib-aux/nm-time-utils.h | 18 +-
shared/{nm-utils => nm-glib-aux}/tests/meson.build | 2 +-
.../tests/test-shared-general.c | 2 +-
shared/nm-libnm-aux/nm-libnm-aux.c | 146 +++
shared/nm-libnm-aux/nm-libnm-aux.h | 24 +
shared/nm-libnm-core-intern/nm-libnm-core-utils.c | 119 +++
shared/nm-libnm-core-intern/nm-libnm-core-utils.h | 13 +
shared/nm-utils/nm-test-utils.h | 12 +-
shared/nm-version-macros.h.in | 1 +
.../{missing_syscall.h => missing_keyctl.h} | 0
.../systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 18 +
shared/systemd/src/basic/errno-util.h | 8 +
shared/systemd/src/basic/fs-util.c | 4 +
shared/systemd/src/basic/macro.h | 28 +
shared/systemd/src/basic/memory-util.h | 21 +-
shared/systemd/src/basic/missing_syscall.h | 574 +++++++++++
shared/systemd/src/basic/parse-util.c | 34 +-
shared/systemd/src/basic/path-util.c | 2 +
shared/systemd/src/basic/process-util.c | 39 +
shared/systemd/src/basic/process-util.h | 23 +-
shared/systemd/src/basic/signal-util.c | 308 ++++++
shared/systemd/src/basic/signal-util.h | 2 +
shared/systemd/src/basic/stat-util.c | 2 +
shared/systemd/src/basic/string-util.c | 12 +
shared/systemd/src/basic/string-util.h | 2 +
shared/systemd/src/basic/strv.c | 28 +-
shared/systemd/src/basic/tmpfile-util.c | 52 +-
src/devices/bluetooth/nm-bluez5-dun.c | 4 +-
src/devices/nm-device-ethernet.c | 4 +-
src/devices/nm-device-wireguard.c | 20 +-
src/devices/nm-device.c | 48 +-
src/devices/nm-lldp-listener.c | 8 +-
src/devices/wifi/nm-device-iwd.c | 4 +-
src/devices/wifi/nm-device-wifi-p2p.c | 2 +-
src/devices/wifi/nm-device-wifi.c | 14 +-
src/devices/wifi/nm-wifi-ap.c | 13 +-
src/devices/wifi/nm-wifi-p2p-peer.c | 8 +-
src/devices/wifi/nm-wifi-utils.c | 6 +
src/dhcp/nm-dhcp-nettools.c | 14 +-
src/dhcp/nm-dhcp-systemd.c | 4 +-
src/dhcp/nm-dhcp-utils.c | 6 +-
src/dns/nm-dns-dnsmasq.c | 6 +-
src/ndisc/nm-fake-ndisc.c | 2 +-
src/ndisc/nm-lndp-ndisc.c | 4 +-
src/ndisc/nm-ndisc.c | 18 +-
src/ndisc/tests/test-ndisc-fake.c | 12 +-
src/nm-auth-manager.h | 14 +-
src/nm-checkpoint.c | 6 +-
src/nm-connectivity.c | 6 +-
src/nm-core-utils.c | 20 +-
src/nm-dbus-manager.c | 4 +-
src/nm-logging.c | 14 +-
src/nm-manager.c | 67 +-
src/nm-policy.c | 6 +-
src/platform/nm-fake-platform.c | 4 +-
src/platform/nm-linux-platform.c | 24 +-
src/platform/nm-platform.c | 34 +-
src/platform/nm-platform.h | 6 +-
src/platform/tests/test-common.c | 28 +-
src/platform/tests/test-common.h | 18 +-
src/platform/tests/test-link.c | 6 +-
src/platform/tests/test-route.c | 6 +-
src/settings/nm-settings-connection.c | 2 +-
src/settings/nm-settings.c | 4 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 8 +
.../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 25 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 4 +
.../tests/network-scripts/ifcfg-test-wifi-owe | 5 +
.../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 40 +
src/supplicant/nm-supplicant-config.c | 7 +-
src/supplicant/nm-supplicant-interface.c | 12 +-
src/supplicant/nm-supplicant-settings-verify.c | 2 +-
src/systemd/src/libsystemd-network/sd-ipv4acd.c | 6 +-
src/systemd/src/libsystemd-network/sd-ipv4ll.c | 2 +-
src/systemd/src/libsystemd/sd-event/event-source.h | 8 +-
src/systemd/src/libsystemd/sd-event/sd-event.c | 462 ++++++++-
src/systemd/src/libsystemd/sd-id128/id128-util.c | 2 +-
src/systemd/src/libsystemd/sd-id128/id128-util.h | 4 +-
src/systemd/src/systemd/sd-event.h | 12 +
src/systemd/src/systemd/sd-ipv4acd.h | 3 +-
src/tests/test-core-with-expect.c | 16 +-
src/tests/test-systemd.c | 2 +-
129 files changed, 3499 insertions(+), 1450 deletions(-)

Upstream: cgit.freedesktop.org


  • Share