opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.11'

Browse Source 
* stable-2.11:
  Fix wrong date/time for commits in refs/meta/config branch
  Fix disabling of git ssh 'download' scheme within DefaultCommandModule

Change-Id: Id9f12bf2bcd35092231784eecec607a0574d357e
This commit is contained in:
David Pursehouse
2015-07-06 09:46:09 +09:00
parent fe99c8ad11 c04812696c
commit 79ea7d3942
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
View File

@@ -79,7 +79,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
}
private final Config gerritConfig;
private final MetaDataUpdate.User metaDataUpdateFactory;
private final Provider<MetaDataUpdate.User> metaDataUpdateFactory;
private final ProjectCache projectCache;
private final GitRepositoryManager gitMgr;
private final ProjectState.Factory projectStateFactory;
@@ -93,7 +93,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
@Inject
PutConfig(@GerritServerConfig Config gerritConfig,
MetaDataUpdate.User metaDataUpdateFactory,
Provider<MetaDataUpdate.User> metaDataUpdateFactory,
ProjectCache projectCache,
GitRepositoryManager gitMgr,
ProjectState.Factory projectStateFactory,
@@ -138,7 +138,7 @@ public class PutConfig implements RestModifyView<ProjectResource, Input> {
final MetaDataUpdate md;
try {
md = metaDataUpdateFactory.create(projectName);
md = metaDataUpdateFactory.get().create(projectName);
} catch (RepositoryNotFoundException notFound) {
throw new ResourceNotFoundException(projectName.get());
} catch (IOException e) {