opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.4'

Browse Source 
By Sasa Zivkov (4) and others
via Sasa Zivkov (1) and others
* stable-2.4:
  Fix duplicated results on status:open project:P branch:B
  Update Gerrit 2.4 ReleaseNotes
  Fix the export-review-notes commands guice bindings.
  Fix merging of access sections
  Update Gerrit 2.4 ReleaseNotes
  Fix: Inconsistent behaviour when replicating refs/meta/config
  Gerrit 2.4 ReleaseNotes
  Fix case check for project name so that symlinks work again

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/git/PushOp.java
	gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java

Change-Id: I540ccb67136a77f94b3bc99f28db726086426775
This commit is contained in:
Shawn O. Pearce
2012-05-21 17:28:23 -07:00
parent 5cc8f6647b b06d7971bd
commit 808f1e1124
5 changed files with 268 additions and 39 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);
}
}
}