opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  ElasticRestClientProvider: Make client field volatile
  AbstractElasticIndexer: Specify charset for InputStreamReader
  SshCommandsIT: Use immutable type for constant field declarations
  rest-api-config.txt: Fix monospace `plugin`

Change-Id: I4dbc4d1876c10ec1cc79a490c86082aa46999163
This commit is contained in:
David Pursehouse 2018-08-29 11:07:04 +09:00
parent 0d4af43cf1 63899d219e
commit 50acf00ad7
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/rest-api-config.txt
View File

@ -1708,7 +1708,7 @@ link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
GerritInfo] entity.
|`note_db_enabled` |not set if `false`|
Whether the NoteDb storage backend is fully enabled.
|`plugin ` ||
|`plugin` ||
Information about Gerrit extensions by plugins as
link:#plugin-config-info[PluginConfigInfo] entity.
|`receive` |optional|

3
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/SshCommandsIT.java
View File

@ -26,7 +26,6 @@ import com.google.gerrit.acceptance.UseSsh;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.sshd.Commands;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -37,7 +36,7 @@ public class SshCommandsIT extends AbstractDaemonTest {
private static final Logger log = LoggerFactory.getLogger(SshCommandsIT.class);
// TODO: It would be better to dynamically generate this list
private static final Map<String, List<String>> COMMANDS =
private static final ImmutableMap<String, List<String>> COMMANDS =
ImmutableMap.of(
Commands.ROOT,
ImmutableList.of(

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java
View File

@ -73,7 +73,7 @@ abstract class AbstractElasticIndex<K, V> implements Index<K, V> {
String content = "";
if (responseEntity != null) {
InputStream contentStream = responseEntity.getContent();
try (Reader reader = new InputStreamReader(contentStream)) {
try (Reader reader = new InputStreamReader(contentStream, UTF_8)) {
content = CharStreams.toString(reader);
}
}

2
gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java
View File

@ -40,7 +40,7 @@ class ElasticRestClientProvider implements Provider<RestClient>, LifecycleListen
private final ElasticConfiguration cfg;
private RestClient client;
private volatile RestClient client;
private ElasticQueryAdapter adapter;
@Inject