Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: Fix invalid json example in POST access endpoint gerrit_plugin: Don't add Implementation-Vendor manifest entry Change-Id: I29a25ed5ff9c158e11085ce60d9d0917b6373a5f
This commit is contained in:
commit
4309f56243
|
@ -1081,12 +1081,14 @@ As result a link:#project-access-info[ProjectAccessInfo] entity is returned.
|
|||
|
||||
{
|
||||
"remove": [
|
||||
"refs/*": {
|
||||
"permissions": {
|
||||
"read": {
|
||||
"rules": {
|
||||
"c2ce4749a32ceb82cd6adcce65b8216e12afb41c": {
|
||||
"action": "ALLOW"
|
||||
{
|
||||
"refs/*": {
|
||||
"permissions": {
|
||||
"read": {
|
||||
"rules": {
|
||||
"c2ce4749a32ceb82cd6adcce65b8216e12afb41c": {
|
||||
"action": "ALLOW"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,10 +44,7 @@ def gerrit_plugin(
|
|||
|
||||
native.java_binary(
|
||||
name = '%s__non_stamped' % name,
|
||||
deploy_manifest_lines = manifest_entries + [
|
||||
"Gerrit-ApiType: plugin",
|
||||
"Implementation-Vendor: Gerrit Code Review",
|
||||
],
|
||||
deploy_manifest_lines = manifest_entries + ["Gerrit-ApiType: plugin"],
|
||||
main_class = 'Dummy',
|
||||
runtime_deps = [
|
||||
':%s__plugin' % name,
|
||||
|
|
Loading…
Reference in New Issue