FreeNAS/freenas 5c935d6gui/freeadmin/templatetags freeadmin.py, gui/sharing forms.py models.py

Merge branch 'freenas/11.1-stable' of github.com:freenas/freenas into freenas/11.1-stable
DeltaFile
+25-0gui/sharing/migrations/0006_afp_share_afp_timemachine_quota_in_gib.py
+12-7src/freenas/etc/find_alias_for_smtplib.py
+17-1gui/system/views.py
+11-0src/middlewared/middlewared/plugins/system.py
+10-0gui/templates/system/system_info.html
+7-2src/middlewared/middlewared/client/ejson.py
+1-6gui/sharing/forms.py
+5-0gui/freeadmin/templatetags/freeadmin.py
+3-2gui/sharing/models.py
+1-1src/freenas/usr/local/libexec/nas/generate_afpd_conf.py
+1-1src/middlewared/middlewared/plugins/disk.py
+1-1src/freenas/etc/ix.rc.d/ix-collectd
+1-1src/middlewared/middlewared/service.py
+95-2213 files

UnifiedSplitRaw