opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.3' into stable-2.4

Browse Source 
* stable-2.3: (27 commits)
  Fix merging of access sections
  Fix: Inconsistent behaviour when replicating refs/meta/config
  Fix case check for project name so that symlinks work again
  Move note about changing approval categories to the correct section
  Fix spelling mistake in access control documentation
  Gerrit 2.3 ReleaseNotes
  Fix link in show caches documentation
  Access control documentation: Administrator example role
  Access control documentation: Project owner example role
  Access control documentation: Integrator example role
  Access control documentation: CI system example role
  Access control documentation: Capability view conn. & queue
  Access control documentation: Developer example role
  Access control documentation: Capability replication and view caches
  Access control documentation: Kill and priority capabilities
  Access control documentation: Flush caches capability
  Access control documentation: Example roles introduced
  Add missing header for suggest.accounts documentation
  Add visible-to-all flag in the documentation for cmd-create-group
  Access control documentation: Create group and project
  ...

Conflicts:
	Documentation/config-gerrit.txt
	ReleaseNotes/index.txt
	gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java

Change-Id: I23398003827ee9c010445e65e6d16b55f2754f3d
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
This commit is contained in:
Sasa Zivkov
2012-05-15 16:05:05 +02:00
parent f0f9a1d553 eb9554f785
commit 21ba30c676
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-common/src/main/java/com/google/gerrit/common/data/AccessSection.java
View File

@@ -97,7 +97,7 @@ public class AccessSection extends RefConfigSection implements
if (dst != null) {
dst.mergeFrom(src);
} else {
permissions.add(dst);
permissions.add(src);
}
}
}