Merge changes I6143263b,I0deada50 into stable-3.1
* changes:
Acceptance BUILD: Fix plugin standalone test exec
Bazel: Reduce size of gerrit-acceptance-framework artifact
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 09ec415..2561f4f 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -1982,8 +1982,8 @@
"name": "Code Analyzer",
"email": "code.analyzer@example.com"
},
- "robotId": "importChecker",
- "robotRunId": "76b1375aa8626ea7149792831fe2ed85e80d9e04"
+ "robot_id": "importChecker",
+ "robot_run_id": "76b1375aa8626ea7149792831fe2ed85e80d9e04"
},
{
"id": "TveXwFiA",
@@ -1995,8 +1995,8 @@
"name": "Code Analyzer",
"email": "code.analyzer@example.com"
},
- "robotId": "styleChecker",
- "robotRunId": "5c606c425dd45184484f9d0a2ffd725a7607839b"
+ "robot_id": "styleChecker",
+ "robot_run_id": "5c606c425dd45184484f9d0a2ffd725a7607839b"
}
]
}
@@ -4780,8 +4780,8 @@
"name": "Code Analyzer",
"email": "code.analyzer@example.com"
},
- "robotId": "importChecker",
- "robotRunId": "76b1375aa8626ea7149792831fe2ed85e80d9e04"
+ "robot_id": "importChecker",
+ "robot_run_id": "76b1375aa8626ea7149792831fe2ed85e80d9e04"
},
{
"id": "TveXwFiA",
@@ -4793,8 +4793,8 @@
"name": "Code Analyzer",
"email": "code.analyzer@example.com"
},
- "robotId": "styleChecker",
- "robotRunId": "5c606c425dd45184484f9d0a2ffd725a7607839b"
+ "robot_id": "styleChecker",
+ "robot_run_id": "5c606c425dd45184484f9d0a2ffd725a7607839b"
}
]
}
@@ -4834,8 +4834,8 @@
"name": "Code Analyzer",
"email": "code.analyzer@example.com"
},
- "robotId": "importChecker",
- "robotRunId": "76b1375aa8626ea7149792831fe2ed85e80d9e04"
+ "robot_id": "importChecker",
+ "robot_run_id": "76b1375aa8626ea7149792831fe2ed85e80d9e04"
}
----
@@ -6706,10 +6706,10 @@
|`subject` |optional|
The new subject for the change, if not specified, will reuse the current patch
set's subject
-|`inheritParent` |optional, default to `false`|
+|`inherit_parent` |optional, default to `false`|
Use the current patch set's first parent as the merge tip when set to `true`.
|`base_change` |optional|
-A link:#change-id[\{change-id\}] that identifies a change. When `inheritParent`
+A link:#change-id[\{change-id\}] that identifies a change. When `inherit_parent`
is `false`, the merge tip will be the current patch set of the `base_change` if
it's set. Otherwise, the current branch tip of the destination branch will be used.
|`merge` ||
diff --git a/tools/remote-bazelrc b/tools/remote-bazelrc
index b26a8e8..826be1d 100644
--- a/tools/remote-bazelrc
+++ b/tools/remote-bazelrc
@@ -70,9 +70,6 @@
# Enable remote execution so actions are performed on the remote systems.
build:remote --remote_executor=remotebuildexecution.googleapis.com
-# Enable encryption.
-build:remote --tls_enabled=true
-
# Set a higher timeout value, just in case.
build:remote --remote_timeout=3600
