Merge tag 'debian/1.10.4-1' into bionic

network-manager Debian release 1.10.4-1

1 files changed, 3 insertions, 1 deletions

diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
index aa0c96eb..f888ff22 100755
--- a/libnm/generate-setting-docs.py
+++ b/libnm/generate-setting-docs.py
@@ -14,7 +14,7 @@
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA.
 #
-# Copyright 2009 - 2014 Red Hat, Inc.
+# Copyright 2009 - 2017 Red Hat, Inc.
 
 from __future__ import print_function
 
@@ -54,10 +54,12 @@ dbus_type_name_map = {
     'ay': 'byte array',
     'a{ss}': 'dict of string to string',
     'a{sv}': 'vardict',
+    'aa{sv}': 'array of vardict',
     'aau': 'array of array of uint32',
     'aay': 'array of byte array',
     'a(ayuay)': 'array of legacy IPv6 address struct',
     'a(ayuayu)': 'array of legacy IPv6 route struct',
+    'aa{sv}': 'array of vardict',
 }
 
 ns_map = {