| commit | d422c960252db69fe67d8d358fd42f57efc677b4 | [log] [tgz] |
|---|---|---|
| author | emmanuel lecharny <emmanuel.lecharny@busit.com> | Tue Sep 17 00:51:19 2019 +0200 |
| committer | emmanuel lecharny <emmanuel.lecharny@busit.com> | Tue Sep 17 00:51:19 2019 +0200 |
| tree | affc22f8cadd2dfaa5cdaa07c75d0a9f155739d8 | |
| parent | be31471046bf96696073ce2be1aec3874649bafd [diff] | |
| parent | c42030f59692518133715f0a4753ce24bb63b2d8 [diff] |
Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server # Conflicts: # protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/PwdModifyHandler.java # server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java