FreeNAS/freenas 0e4584bgui choices.py, gui/account forms.py

Merge branch 'master' into issues/25529
DeltaFile
+111-1src/freenas-sysctl/services.c
+13-38gui/middleware/notifier.py
+21-0gui/services/migrations/0012_auto_20170810_1542.py
+20-0gui/services/migrations/0013_cifs_srv_min_protocol_core.py
+19-0gui/choices.py
+12-1gui/network/forms.py
+12-1gui/vm/forms.py
+3-9gui/account/forms.py
+11-0src/freenas-sysctl/freenas_sysctl.h
+8-2gui/storage/forms.py
+7-2src/middlewared/middlewared/plugins/vm.py
+6-1gui/services/models.py
+5-0src/middlewared/middlewared/pytest/functional/test_0085_user.py
+5-0src/middlewared/middlewared/pytest/functional/test_0035_group.py
+2-2src/freenas/usr/local/libexec/freenas-debug/system/system.sh
+3-1src/freenas/etc/rc.conf.local
+3-0gui/freeadmin/static/lib/js/freeadmin.js
+2-1src/middlewared/middlewared/plugins/account.py
+1-1gui/services/migrations/0001_initial.py
+1-1src/freenas-sysctl/utils.c
+2-0src/freenas/etc/ix.rc.d/ix-nginx
+1-1src/freenas/etc/ix.rc.d/ix-pre-samba
+1-1src/freenas/usr/local/bin/sockscopy
+2-0src/freenas/usr/local/libexec/nas/generate_afpd_conf.py
+2-0src/middlewared/middlewared/main.py
+0-1src/freenas/etc/rc.conf
+1-0gui/freeadmin/views.py
+1-0nas_ports/freenas/py-middlewared/Makefile
+1-0gui/services/forms.py
+276-6429 files

UnifiedSplitRaw