release: bump version to 1.25.1-dev after 1.25.0 release

System Internals / NetworkManager - Thomas Haller [redhat.com] - 8 May 2020 13:00 UTC



###

release: bump version to 1.25.1-dev after 1.25.0 release


diff --cc configure.ac
index 245381885,3594f8312..2d5e7241c
--- 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], [24])
- m4_define([nm_micro_version], [0])
+ m4_define([nm_minor_version], [25])
-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 bb0bcd98f,9946e2677..a2d925a7e
--- a/meson.build
+++ b/meson.build
@@@ -6,7 -6,7 +6,7 @@@ project
# - add corresponding NM_VERSION_x_y_z macros in
# "shared/nm-version-macros.h.in"
# - update number in configure.ac
- version: '1.24.0',
- version: '1.25.0',
++ version: '1.25.1',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',

c6e51f61d release: bump version to 1.25.1-dev after 1.25.0 release

NEWS | 17 +
clients/cli/connections.c | 9 +-
clients/cli/devices.c | 4 +
clients/cli/general.c | 4 +
clients/common/nm-meta-setting-desc.c | 149 +-
clients/common/nm-meta-setting-desc.h | 1 +
clients/common/nm-secret-agent-simple.c | 4 +-
clients/common/nm-vpn-helpers.c | 98 +-
clients/common/nm-vpn-helpers.h | 4 +-
clients/common/settings-docs.h.in | 12 +
configure.ac | 4 +-
contrib/fedora/rpm/build.sh | 7 +
contrib/fedora/rpm/build_clean.sh | 3 +
dispatcher/nm-dispatcher.conf | 11 +-
examples/C/glib/list-connections-libnm.c | 7 +-
examples/python/dbus/checkpoint.py | 2 +-
.../python/dbus/get-active-connection-uuids.py | 2 +-
examples/python/dbus/list-devices.py | 2 +-
examples/python/dbus/vpn.py | 1 -
examples/python/dbus/wifi-active-ap.py | 4 +-
examples/python/gi/checkpoint.py | 4 +-
examples/python/gi/deactivate-all.py | 2 +-
examples/python/gi/dns.py | 1 -
examples/python/gi/get-active-connections.py | 2 +-
examples/python/gi/get-devices.py | 2 +-
examples/python/gi/get-interface-flags.py | 2 +-
examples/python/gi/get_ips.py | 2 +-
examples/python/gi/nm-add-connection2.py | 1 -
examples/python/gi/nm-update2.py | 1 -
examples/python/gi/nm-wg-set | 3 +-
examples/python/gi/wifi-p2p.py | 109 +
libnm-core/nm-core-internal.h | 82 +-
libnm-core/nm-setting-bridge-port.c | 16 +-
libnm-core/nm-setting-bridge.c | 506 +++-
libnm-core/nm-setting-bridge.h | 72 +-
libnm-core/nm-setting-connection.c | 83 +
libnm-core/nm-setting-connection.h | 4 +
libnm-core/nm-setting-match.c | 454 +++-
libnm-core/nm-setting-match.h | 39 +
libnm-core/nm-utils.c | 2 +-
libnm-core/nm-version.h | 14 +
libnm-core/tests/test-general.c | 1 +
libnm-core/tests/test-setting.c | 7 +
libnm/generate-setting-docs.py | 3 +-
libnm/libnm.ver | 28 +
man/NetworkManager.conf.xml | 4 +
man/nm-initrd-generator.xml | 43 +
meson.build | 2 +-
po/POTFILES.in | 1 +
po/uk.po | 2626 +++++++++++---------
shared/nm-glib-aux/nm-macros-internal.h | 46 +-
shared/nm-glib-aux/nm-shared-utils.c | 20 +
shared/nm-glib-aux/nm-shared-utils.h | 100 +
shared/nm-keyfile/nm-keyfile-utils.c | 212 +-
shared/nm-keyfile/nm-keyfile-utils.h | 80 +-
shared/nm-keyfile/nm-keyfile.c | 65 +-
shared/nm-libnm-core-intern/nm-common-macros.h | 2 +
shared/nm-test-libnm-utils.h | 5 +
shared/nm-version-macros.h.in | 1 +
shared/systemd/nm-sd-utils-shared.c | 43 +
shared/systemd/nm-sd-utils-shared.h | 4 +
shared/systemd/src/shared/web-util.c | 34 +-
src/devices/nm-device-bridge.c | 256 +-
src/devices/nm-device-macsec.c | 5 +-
src/devices/nm-device-macvlan.c | 10 +-
src/devices/nm-device.c | 118 +-
src/devices/ovs/nm-ovsdb.c | 21 +-
src/dhcp/nm-dhcp-client.c | 21 +
src/dhcp/nm-dhcp-client.h | 2 +
src/dhcp/nm-dhcp-dhclient-utils.c | 22 +
src/dhcp/nm-dhcp-dhclient-utils.h | 1 +
src/dhcp/nm-dhcp-dhclient.c | 6 +
src/dhcp/nm-dhcp-helper.c | 47 +-
src/dhcp/nm-dhcp-manager.c | 6 +
src/dhcp/nm-dhcp-manager.h | 2 +
src/dhcp/nm-dhcp-nettools.c | 59 +-
src/dhcp/nm-dhcp-options.c | 2 +
src/dhcp/nm-dhcp-options.h | 2 +
src/dhcp/nm-dhcp-systemd.c | 20 +
src/dhcp/tests/test-dhcp-dhclient.c | 59 +-
src/initrd/nm-initrd-generator.c | 40 +-
src/initrd/nm-initrd-generator.h | 2 +-
src/initrd/nmi-cmdline-reader.c | 73 +-
src/initrd/tests/test-cmdline-reader.c | 104 +-
src/ndisc/nm-lndp-ndisc.c | 27 +-
src/ndisc/nm-ndisc.c | 39 +-
src/ndisc/tests/test-ndisc-fake.c | 5 +-
src/nm-auth-manager.c | 171 +-
src/nm-config-data.c | 19 +-
src/nm-config.c | 151 +-
src/nm-config.h | 4 +-
src/nm-core-utils.c | 14 +-
src/nm-dbus-manager.c | 8 +-
src/nm-iface-helper.c | 2 +
src/nm-manager.c | 6 +-
src/org.freedesktop.NetworkManager.conf | 252 +-
src/platform/nm-netlink.h | 14 +-
src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf | 13 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 99 +-
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c | 3 +
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 2 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 227 +-
.../ifcfg-Test_Write_Wired_match.cexpected | 2 +
.../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 3 +
.../src/libsystemd-network/sd-dhcp6-client.c | 2 +-
src/systemd/src/systemd/sd-dhcp6-client.h | 2 +-
106 files changed, 4724 insertions(+), 2292 deletions(-)

Upstream: cgit.freedesktop.org


  • Share