opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11' into stable-2.12

Browse Source 
* stable-2.11:
  Document that ldap.groupBase and ldap.accountBase are repeatable
  OAuth-Linking: Don't create new account when claimed identity unknown
  Update 2.11.5 release notes to mention forked buck
  Revert "Update buck to ba9f239f69287a553ca93af76a27484d83693563"

Change-Id: I76b92f8fb11cd2f16e6870e3bd219c454a5bfad8
This commit is contained in:
David Pursehouse
2015-12-16 15:42:29 +09:00
parent 11fb1f5a05 82d55631b8
commit a897647963
3 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config-gerrit.txt
View File

@@ -2538,6 +2538,9 @@ server to respond until the TCP connection times out.
+
Root of the tree containing all user accounts. This is typically
of the form `ou=people,dc=example,dc=com`.
+
This setting may be added multiple times to specify more than
one root.
[[ldap.accountScope]]ldap.accountScope::
+
@@ -2649,6 +2652,9 @@ Active Directory.
+
Root of the tree containing all group objects. This is typically
of the form `ou=groups,dc=example,dc=com`.
+
This setting may be added multiple times to specify more than
one root.
[[ldap.groupScope]]ldap.groupScope::
+