opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Set version to 3.0.5-SNAPSHOT
  Set version to 3.0.4
  ReviewerAddedEvent: extend event with 'adder'
  Post/Delete GPG keys: Remove incorrect comments

Change-Id: I4c19ac3df0e113aac3fb98eb6edc1cac47910126
This commit is contained in:
David Pursehouse
2019-11-11 11:59:56 -08:00
parent 17b60d9927 3ac05104ae
commit 1aa88fe5f9
5 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/gpg/server/DeleteGpgKey.java
View File

@@ -109,7 +109,6 @@ public class DeleteGpgKey implements RestModifyView<GpgKey, Input> {
}
break;
case LOCK_FAILURE:
// should not happen since this case is already handled by PublicKeyStore#save
case FORCED:
case IO_FAILURE:
case NEW:

1
java/com/google/gerrit/gpg/server/PostGpgKeys.java
View File

@@ -275,7 +275,6 @@ public class PostGpgKeys implements RestModifyView<AccountResource, GpgKeysInput
case NO_CHANGE:
break;
case LOCK_FAILURE:
// should not happen since this case is already handled by PublicKeyStore#save
case IO_FAILURE:
case NOT_ATTEMPTED:
case REJECTED: