release: bump version to 1.17.1-dev after 1.16.0 release

System Internals / NetworkManager - Thomas Haller [redhat.com] - 15 March 2019 15:23 EDT



###

release: bump version to 1.17.1-dev after 1.16.0 release

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

Also bump the micro version to 1.17.1-dev to indicate that this is
after 1.16.0 is out.


diff --cc configure.ac
index 967eac032,865f2c28f..1c00e4b81
--- 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], [16])
- m4_define([nm_micro_version], [0])
+ m4_define([nm_minor_version], [17])
-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 498187914,b375b9d40..ee74e54d7
--- 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.16.0',
- version: '1.17.0',
++ version: '1.17.1',
license: 'GPL2+',
default_options: [
'buildtype=debugoptimized',

e491b4680 release: bump version to 1.17.1-dev after 1.16.0 release

Makefile.am | 2 +
NEWS | 10 +
configure.ac | 4 +-
contrib/scripts/NM-log | 4 +-
libnm-core/nm-version.h | 14 +
meson.build | 2 +-
shared/nm-utils/c-list-util.h | 23 +
shared/nm-utils/nm-hash-utils.h | 27 +-
shared/nm-version-macros.h.in | 1 +
src/devices/wwan/nm-device-modem.c | 13 +-
src/meson.build | 1 +
src/nm-ip4-config.c | 6 +-
src/nm-netns.c | 16 +-
src/nm-netns.h | 2 +
src/nm-types.h | 20 +-
src/platform/nm-fake-platform.c | 2 +-
src/platform/nm-linux-platform.c | 729 +++++++++++++++++++++++++------
src/platform/nm-platform.c | 563 +++++++++++++++++++++---
src/platform/nm-platform.h | 113 ++++-
src/platform/nmp-object.c | 154 +++++--
src/platform/nmp-object.h | 144 +++++-
src/platform/nmp-rules-manager.c | 660 ++++++++++++++++++++++++++++
src/platform/nmp-rules-manager.h | 61 +++
src/platform/tests/test-common.h | 52 +++
src/platform/tests/test-nmp-object.c | 2 +-
src/platform/tests/test-route.c | 824 +++++++++++++++++++++++++++++++++++
26 files changed, 3175 insertions(+), 274 deletions(-)

Upstream: cgit.freedesktop.org


  • Share