opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10'

Browse Source 
Conflicts:
	gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java

Change-Id: I64ca4005da7d3c676954b4da397e5c9566c934a1
This commit is contained in:
Shawn Pearce
2014-08-27 17:18:48 -07:00
parent bce80ffca4 9954c4e249
commit 137c303fdd
13 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
View File

@@ -164,7 +164,7 @@ public class CherryPick extends SubmitStrategy {
ChangeUtil.nextPatchSetId(args.repo, n.change().currentPatchSetId());
final PatchSet ps = new PatchSet(id);
ps.setCreatedOn(TimeUtil.nowTs());
ps.setUploader(submitAudit.getAccountId());
ps.setUploader(cherryPickUser.getAccountId());
ps.setRevision(new RevId(newCommit.getId().getName()));
final RefUpdate ru;