mirror of https://github.com/apache/cloudstack.git
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
server/src/com/cloud/server/auth/UserAuthenticator.java
server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| PlainTextUserAuthenticator.java | ||