From 92a34d0b6c8b49496f22941557390d7bc7e84073 Mon Sep 17 00:00:00 2001
From: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
Date: Fri, 15 Dec 2017 06:25:11 -0500
Subject: [PATCH 1/2] gerrit_plugin: Don't add Implementation-Vendor manifest
 entry

If a plugin specifies Implementation-Vendor, adding it again in the
gerrit_plugin rule results in a duplicate entry and the following
warning at build time:

  WARNING: Duplicate name in Manifest: Implementation-Vendor.
  Ensure that the manifest does not have duplicate entries, and
  that blank lines separate individual sections in both your
  manifest and in the META-INF/MANIFEST.MF entry in the jar file.

This change is the same as done in bazlets project by David Ostrovsky.

Change-Id: Iac72c1d1dbe11877e4e2042d2e11c8966147d7a9
---
 tools/bzl/plugin.bzl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index f8fc7828a4..a8c4eb2c83 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -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,

From 0c4dabf6995721614c33237f04f47c6289f0ef34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Ar=C3=A8s?= <hugo.ares@ericsson.com>
Date: Mon, 18 Dec 2017 15:00:40 -0500
Subject: [PATCH 2/2] Fix invalid json example in POST access endpoint

Change-Id: I8032c066ec29b4ac24a6ba108c62f2f3d8d3353d
---
 Documentation/rest-api-projects.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Documentation/rest-api-projects.txt b/Documentation/rest-api-projects.txt
index d5bb159b45..af3c75713f 100644
--- a/Documentation/rest-api-projects.txt
+++ b/Documentation/rest-api-projects.txt
@@ -1047,12 +1047,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"
+                }
               }
             }
           }