Merge pull request #37233 from rallytime/bp-37154

Back-port #37154 to 2016.3
This commit is contained in:
Nicole Thomas 2016-10-25 12:32:56 -06:00 committed by GitHub
commit 3c94315d35

View file

@ -660,7 +660,7 @@ def unjoin_domain(username=None,
if username and password is None:
return 'Must specify a password if you pass a username'
NETSETUP_ACCT_DELETE = 0x2
NETSETUP_ACCT_DELETE = 0x4 # pylint: disable=invalid-name
unjoin_options = 0x0
if disable: