Commit cbeb34d3 authored by Thomas Haller's avatar Thomas Haller

release: bump version to 1.13.1-dev after 1.12.0 release

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

Also bump the micro version to 1.13.1-dev to indicate that this is
after 1.12.0 is out.
parents 8964dbe8 8076a6f0
......@@ -204,6 +204,8 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
introspection/org.freedesktop.NetworkManager.Device.Macsec.h \
introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \
......@@ -236,6 +238,8 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
introspection/org.freedesktop.NetworkManager.Device.Wpan.c \
introspection/org.freedesktop.NetworkManager.Device.Wpan.h \
introspection/org.freedesktop.NetworkManager.Device.c \
introspection/org.freedesktop.NetworkManager.Device.h \
introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
......@@ -289,6 +293,7 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
......@@ -307,7 +312,8 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml
docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
introspection/%.c: introspection/%.xml
@$(MKDIR_P) introspection/
......@@ -340,6 +346,7 @@ dbusinterfaces_DATA = \
introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
......@@ -356,6 +363,7 @@ dbusinterfaces_DATA = \
introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
introspection/org.freedesktop.NetworkManager.Device.xml \
introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
......@@ -395,6 +403,7 @@ libnm_core_lib_h_pub_real = \
libnm-core/nm-core-types.h \
libnm-core/nm-dbus-interface.h \
libnm-core/nm-errors.h \
libnm-core/nm-setting-6lowpan.h \
libnm-core/nm-setting-8021x.h \
libnm-core/nm-setting-adsl.h \
libnm-core/nm-setting-bluetooth.h \
......@@ -435,6 +444,7 @@ libnm_core_lib_h_pub_real = \
libnm-core/nm-setting-wired.h \
libnm-core/nm-setting-wireless-security.h \
libnm-core/nm-setting-wireless.h \
libnm-core/nm-setting-wpan.h \
libnm-core/nm-setting.h \
libnm-core/nm-simple-connection.h \
libnm-core/nm-utils.h \
......@@ -463,6 +473,7 @@ libnm_core_lib_h_priv = \
libnm-core/nm-setting-private.h \
libnm-core/nm-utils-private.h
libnm_core_lib_c_settings_real = \
libnm-core/nm-setting-6lowpan.c \
libnm-core/nm-setting-8021x.c \
libnm-core/nm-setting-adsl.c \
libnm-core/nm-setting-bluetooth.c \
......@@ -502,7 +513,8 @@ libnm_core_lib_c_settings_real = \
libnm-core/nm-setting-wimax.c \
libnm-core/nm-setting-wired.c \
libnm-core/nm-setting-wireless-security.c \
libnm-core/nm-setting-wireless.c
libnm-core/nm-setting-wireless.c \
libnm-core/nm-setting-wpan.c
libnm_core_lib_c_real = \
$(libnm_core_lib_c_settings_real) \
shared/nm-utils/c-list-util.c \
......@@ -773,6 +785,7 @@ libnm_lib_h_pub_real = \
libnm/nm-autoptr.h \
libnm/nm-checkpoint.h \
libnm/nm-client.h \
libnm/nm-device-6lowpan.h \
libnm/nm-device-adsl.h \
libnm/nm-device-bond.h \
libnm/nm-device-bridge.h \
......@@ -796,6 +809,7 @@ libnm_lib_h_pub_real = \
libnm/nm-device-vxlan.h \
libnm/nm-device-wifi.h \
libnm/nm-device-wimax.h \
libnm/nm-device-wpan.h \
libnm/nm-device.h \
libnm/nm-dhcp-config.h \
libnm/nm-ip-config.h \
......@@ -829,6 +843,7 @@ libnm_lib_c_real = \
libnm/nm-checkpoint.c \
libnm/nm-client.c \
libnm/nm-dbus-helpers.c \
libnm/nm-device-6lowpan.c \
libnm/nm-device-adsl.c \
libnm/nm-device-bond.c \
libnm/nm-device-bridge.c \
......@@ -852,6 +867,7 @@ libnm_lib_c_real = \
libnm/nm-device-vxlan.c \
libnm/nm-device-wifi.c \
libnm/nm-device-wimax.c \
libnm/nm-device-wpan.c \
libnm/nm-device.c \
libnm/nm-dhcp-config.c \
libnm/nm-dhcp4-config.c \
......@@ -1482,11 +1498,13 @@ src_libNetworkManagerBase_la_SOURCES = \
src/platform/nm-platform-private.h \
src/platform/nm-linux-platform.c \
src/platform/nm-linux-platform.h \
src/platform/wifi/wifi-utils-nl80211.c \
src/platform/wifi/wifi-utils-nl80211.h \
src/platform/wifi/wifi-utils-private.h \
src/platform/wifi/wifi-utils.c \
src/platform/wifi/wifi-utils.h \
src/platform/wifi/nm-wifi-utils-nl80211.c \
src/platform/wifi/nm-wifi-utils-nl80211.h \
src/platform/wifi/nm-wifi-utils-private.h \
src/platform/wifi/nm-wifi-utils.c \
src/platform/wifi/nm-wifi-utils.h \
src/platform/wpan/nm-wpan-utils.c \
src/platform/wpan/nm-wpan-utils.h \
\
src/ndisc/nm-lndp-ndisc.c \
src/ndisc/nm-lndp-ndisc.h \
......@@ -1519,8 +1537,8 @@ src_libNetworkManagerBase_la_SOURCES = \
if WITH_WEXT
src_libNetworkManagerBase_la_SOURCES += \
src/platform/wifi/wifi-utils-wext.c \
src/platform/wifi/wifi-utils-wext.h
src/platform/wifi/nm-wifi-utils-wext.c \
src/platform/wifi/nm-wifi-utils-wext.h
endif
src_libNetworkManagerBase_la_LIBADD = \
......@@ -1532,6 +1550,9 @@ src_libNetworkManagerBase_la_LIBADD = \
$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
EXTRA_DIST += \
src/platform/linux/nl802154.h
###############################################################################
src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
......@@ -1558,6 +1579,8 @@ src_libNetworkManager_la_SOURCES = \
src/devices/nm-device-logging.h \
src/devices/nm-device-private.h \
\
src/devices/nm-device-6lowpan.c \
src/devices/nm-device-6lowpan.h \
src/devices/nm-device-bond.c \
src/devices/nm-device-bond.h \
src/devices/nm-device-bridge.c \
......@@ -1584,6 +1607,8 @@ src_libNetworkManager_la_SOURCES = \
src/devices/nm-device-vlan.h \
src/devices/nm-device-vxlan.c \
src/devices/nm-device-vxlan.h \
src/devices/nm-device-wpan.c \
src/devices/nm-device-wpan.h \
\
src/dhcp/nm-dhcp-dhcpcanon.c \
src/dhcp/nm-dhcp-dhclient.c \
......
=============================================
NetworkManager-1.?? (not released yet)
Overview of changes since NetworkManager-1.12
=============================================
* Added support for IEEE 802.15.4 and 6LowPAN devices.
=============================================
NetworkManager-1.12
Overview of changes since NetworkManager-1.10
......
......@@ -660,6 +660,8 @@ const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYP
NM_SETTING_MACSEC_SETTING_NAME"," \
NM_SETTING_MACVLAN_SETTING_NAME"," \
NM_SETTING_VXLAN_SETTING_NAME"," \
NM_SETTING_WPAN_SETTING_NAME","\
NM_SETTING_6LOWPAN_SETTING_NAME","\
NM_SETTING_PROXY_SETTING_NAME"," \
NM_SETTING_TC_CONFIG_SETTING_NAME
// NM_SETTING_DUMMY_SETTING_NAME
......@@ -890,7 +892,11 @@ usage_connection_add (void)
" [source-port-min <0-65535>]\n"
" [source-port-max <0-65535>]\n"
" [destination-port <0-65535>]\n\n"
" dummy: \n\n"
" wpan: [short-addr <0x0000-0xffff>]\n\n"
" [pan-id <0x0000-0xffff>]\n\n"
" [mac <MAC address>]\n\n"
" 6lowpan: dev <parent device (connection UUID, ifname, or MAC)>\n"
" dummy:\n\n"
" SLAVE_OPTIONS:\n"
" bridge: [priority <0-63>]\n"
" [path-cost <1-65535>]\n"
......@@ -8106,6 +8112,8 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
g_print ("\n\n");
g_print (_("Type 'help' or '?' for available commands."));
g_print ("\n");
g_print (_("Type 'print' to show all the connection properties."));
g_print ("\n");
g_print (_("Type 'describe [<setting>.<prop>]' for detailed property description."));
g_print ("\n\n");
......
This diff is collapsed.
......@@ -106,7 +106,7 @@ struct _NmcOutputField {
typedef struct _NmcConfig {
NMCPrintOutput print_output; /* Output mode */
gboolean use_colors; /* Whether to use colors for output: option '--color' */
bool use_colors; /* Whether to use colors for output: option '--color' */
bool multiline_output; /* Multiline output instead of default tabular */
bool escape_values; /* Whether to escape ':' and '\' in terse tabular mode */
bool in_editor; /* Whether running the editor - nmcli con edit' */
......
......@@ -14,7 +14,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright 2010 - 2017 Red Hat, Inc.
* Copyright 2010 - 2018 Red Hat, Inc.
*/
#include "nm-default.h"
......@@ -775,7 +775,9 @@ _get_fcn_gobject_int (ARGS_GET_FCN)
GParamSpec *pspec;
nm_auto_unset_gvalue GValue gval = G_VALUE_INIT;
gint64 v;
guint base = 10;
const NMMetaUtilsIntValueInfo *value_infos;
char *return_str;
RETURN_UNSUPPORTED_GET_TYPE ();
......@@ -801,19 +803,38 @@ _get_fcn_gobject_int (ARGS_GET_FCN)
break;
}
if ( property_info->property_typ_data