Chiebot-Mirror
/
data-plane-api
mirror of https://github.com/envoyproxy/data-plane-api.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

hcm: fix merge snafu with conflicting field numbers. (#486)

Browse Source 
Signed-off-by: Harvey Tuch <htuch@google.com>
pull/487/head
htuch 7 years ago committed by Matt Klein
parent e32896e7dc
commit d09b0aabfb
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto

3
envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto
Unescape View File

@ -19,6 +19,7 @@ import "gogoproto/gogo.proto";
// [#protodoc-title: HTTP connection manager] // [#protodoc-title: HTTP connection manager]
// HTTP connection manager :ref:`configuration overview <config_http_conn_man>`. // HTTP connection manager :ref:`configuration overview <config_http_conn_man>`.
// [#comment:next free field: 21]
message HttpConnectionManager { message HttpConnectionManager {
enum CodecType { enum CodecType {
option (gogoproto.goproto_enum_prefix) = false; option (gogoproto.goproto_enum_prefix) = false;
@ -243,7 +244,7 @@ message HttpConnectionManager {
// :ref:`http_connection_manager.represent_ipv4_remote_address_as_ipv4_mapped_ipv6 // :ref:`http_connection_manager.represent_ipv4_remote_address_as_ipv4_mapped_ipv6
// <config_http_conn_man_runtime_represent_ipv4_remote_address_as_ipv4_mapped_ipv6>` for runtime // <config_http_conn_man_runtime_represent_ipv4_remote_address_as_ipv4_mapped_ipv6>` for runtime
// control. // control.
bool represent_ipv4_remote_address_as_ipv4_mapped_ipv6 = 19; bool represent_ipv4_remote_address_as_ipv4_mapped_ipv6 = 20;
} }
message Rds { message Rds {

Write Preview
Loading…
Cancel
Save