Merge pull request #355 from netbox-community/develop

Version 0.26.2
Preparation for 0.26.2
2020-10-27 16:41:48 +01:00 · 2020-10-27 16:24:10 +01:00 · 2020-10-27 16:22:59 +01:00 · 2020-10-27 16:11:55 +01:00 · 2020-10-27 21:12:26 +08:00 · 2020-10-27 19:27:51 +08:00
2 changed files with 7 additions and 1 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-0.26.1
+0.26.2
--- a/docker/ldap_config.docker.py
+++ b/docker/ldap_config.docker.py
@@ -13,3 +13,9 @@ def __getattr__(name):
    except:
      pass
  raise AttributeError
+
+def __dir__():
+  names = []
+  for config in _loaded_configurations:
+    names.extend(config.__dir__())
+  return names
Author	SHA1	Message	Date
Christian Mäder	a51ad36801	Merge pull request #355 from netbox-community/develop Version 0.26.2	2020-10-27 16:41:48 +01:00
Christian Mäder	953ee09b0c	Preparation for 0.26.2	2020-10-27 16:24:10 +01:00
Christian Mäder	94047d60ed	Merge branch 'release' into develop	2020-10-27 16:22:59 +01:00
Christian Mäder	80bfd98000	Merge pull request #354 from comphilip/release Fix ldap configuration in /etc/netbox/config/ldap/*.py not loaded	2020-10-27 16:11:55 +01:00
comphilip	7694fd320a	use extend method for simplification. Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>	2020-10-27 21:12:26 +08:00
comphilip	a3c21ae0ac	Fix ldap configuration in /etc/netbox/config/ldap/*.py not loaded	2020-10-27 19:27:51 +08:00
@@ -1 +1 @@
 .26.1
 .26.2