Marco Ceppi bb7191e953 Merge upstream v2.8.5 into develop ...

# Conflicts:
#	netbox/dcim/api/serializers.py
#	netbox/dcim/models/__init__.py
#	netbox/extras/constants.py
#	netbox/netbox/admin.py
#	netbox/templates/users/base.html
#	requirements.txt

2020-05-27 15:44:47 -04:00

..

000_users.py

Vapor API Scaffold (#2)

2019-09-24 13:53:58 -04:00

001_tenants.py

Allow for creation of interfaces and tenants in startup / initializers

2019-11-25 11:31:44 -05:00

010_groups.py

Vapor API Scaffold (#2)

2019-09-24 13:53:58 -04:00

020_custom_fields-required.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

030_regions.py

Vapor API Scaffold (#2)

2019-09-24 13:53:58 -04:00

040_sites.py

Vapor API Scaffold (#2)

2019-09-24 13:53:58 -04:00

050_manufacturers-required.py

Always run *some* startup scripts even when disabled

2019-11-21 17:29:08 -05:00

060_device_types-required.py

Always run *some* startup scripts even when disabled

2019-11-21 17:29:08 -05:00

070_rack_roles-required.py

Merge upstream v2.8.5 into develop

2020-05-27 15:44:47 -04:00

071_rack_groups.py

Add initializers to produce a single 6 wedge site with 9U lockers

2019-10-08 11:07:47 -04:00

080_racks.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

090_device_roles-required.py

Merge upstream v2.8.5 into develop

2020-05-27 15:44:47 -04:00

100_platforms.py

Vapor API Scaffold (#2)

2019-09-24 13:53:58 -04:00

110_devices.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

120_interfaces.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

210_vlans.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

220_prefixes.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

250_dcim_interfaces.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00

260_ip_addresses.py

Merge upstream v2.7.8 into develop

2020-02-27 08:40:35 -05:00