Code

WIP: xDS mux unification#14496

Code

Closed

dmitri-d wants to merge 34 commits intoenvoyproxy:mainenvoyproxy/envoy:mainfrom dmitri-d:xds-unificationCopy head branch name to clipboard

+2,932-1,763

Commits

Commits on Nov 25, 2019

• Un-revert the revert of xDS (#9044)

  Show description for c4065cb
  fredlas

  committed
  c4065cb

  Copy full SHA for c4065cb

• remove unused var

  Show description for 38a29ed
  fredlas

  committed
  38a29ed

  Copy full SHA for 38a29ed

• restore the pre-WatchMap SotW behavior removed by 8350

  Show description for 30ce222
  fredlas

  committed
  30ce222

  Copy full SHA for 30ce222

• Merge remote-tracking branch 'upstream/master' into UNR_unrevert_xds_unification

  Show description for 53a23d4
  fredlas

  committed
  53a23d4

  Copy full SHA for 53a23d4

Commits on Dec 2, 2019

• Revert "restore the pre-WatchMap SotW behavior removed by 8350"

  Show description for 71ca3e8
  fredlas

  committed
  71ca3e8

  Copy full SHA for 71ca3e8

• finish removing the vestigial resource_names_ and surrounding cruft

  Show description for 2342de6
  fredlas

  committed
  2342de6

  Copy full SHA for 2342de6

• Merge remote-tracking branch 'upstream/master' into UNR_unrevert_xds_unification

  Show description for d311dd7
  fredlas

  committed
  d311dd7

  Copy full SHA for d311dd7

Commits on Dec 4, 2019

• swap disable init fetch timer call and onConfigUpdate, to match existing behavior, which treats any news about the fetch as precluding a timeout, as opposed to only wanting a successful one

  Show description for 496c8b8
  fredlas

  committed
  496c8b8

  Copy full SHA for 496c8b8

• Merge remote-tracking branch 'upstream/master' into UNR_unrevert_xds_unification

  Show description for f79e8b2
  fredlas

  committed
  f79e8b2

  Copy full SHA for f79e8b2

Commits on Dec 6, 2019

• add debug logging to new SotW xDS subscription implementation

  Show description for e26c18f
  fredlas

  committed
  e26c18f

  Copy full SHA for e26c18f

• Merge remote-tracking branch 'upstream/master' into UNR_unrevert_xds_unification

  Show description for baeacf9
  fredlas

  committed
  baeacf9

  Copy full SHA for baeacf9

Commits on Dec 10, 2019

• Merge remote-tracking branch 'upstream/master' into UNR_unrevert_xds_unification

  Show description for 886667d
  fredlas

  committed
  886667d

  Copy full SHA for 886667d

Commits on Dec 12, 2019

• more logging, tighter popping of PausableAckQueue just in case

  Show description for efb453e
  fredlas

  committed
  efb453e

  Copy full SHA for efb453e

• Merge remote-tracking branch 'upstream/master' into UNR_unrevert_xds_unification

  Show description for 23b8270
  fredlas

  committed
  23b8270

  Copy full SHA for 23b8270

Commits on Nov 27, 2020

• Merge branch 'xds-unification-fred' into xds-unification

  Show description for 50f566b
  

  Dmitri Dolguikh

  committed
  50f566b

  Copy full SHA for 50f566b

• Format fixes

  Show description for d5b01e6
  

  Dmitri Dolguikh

  committed
  d5b01e6

  Copy full SHA for d5b01e6

Commits on Dec 4, 2020

• Merge remote-tracking branch 'upstream' into xds-unification

  Show description for 1890777
  

  Dmitri Dolguikh

  committed
  1890777

  Copy full SHA for 1890777

Commits on Dec 11, 2020

• All tests are passing now

  Show description for da6b77a
  

  Dmitri Dolguikh

  committed
  da6b77a

  Copy full SHA for da6b77a

• Fixed formatting

  Show description for d6e6c34
  

  Dmitri Dolguikh

  committed
  d6e6c34

  Copy full SHA for d6e6c34

• Merge remote-tracking branch 'upstream' into xds-unification

  Show description for 30093c7
  

  Dmitri Dolguikh

  committed
  30093c7

  Copy full SHA for 30093c7

Commits on Dec 18, 2020

• Ported GrpcMux and GrpcSubscription from master to provide a mux implementation that is wire-compatible with the legacy grpc mux used in non-delta xDS

  Show description for c786196
  

  Dmitri Dolguikh

  committed
  c786196

  Copy full SHA for c786196

• Formatting fixes

  Show description for 9442319
  

  Dmitri Dolguikh

  committed
  9442319

  Copy full SHA for 9442319

Commits on Dec 19, 2020

• Merge remote-tracking branch 'upstream' into xds-unification

  Show description for 469c3c1
  

  Dmitri Dolguikh

  committed
  469c3c1

  Copy full SHA for 469c3c1

• fixes for errors reported by codeql

  Show description for f16341f
  

  Dmitri Dolguikh

  committed
  f16341f

  Copy full SHA for f16341f

Commits on Dec 21, 2020

• Merge remote-tracking branch 'upstream' into xds-unification

  Show description for d5e7a10
  

  Dmitri Dolguikh

  committed
  d5e7a10

  Copy full SHA for d5e7a10

Commits on Jan 4, 2021

• Fixed formatting issues

  Show description for a74d1a7
  

  Dmitri Dolguikh

  committed
  a74d1a7

  Copy full SHA for a74d1a7

• Fixed formatting issues

  Show description for e41dbcc
  

  Dmitri Dolguikh

  committed
  e41dbcc

  Copy full SHA for e41dbcc

• Fixing formatting

  Show description for abe849f
  

  Dmitri Dolguikh

  committed
  abe849f

  Copy full SHA for abe849f

Commits on Jan 5, 2021

• Fixing formatting

  Show description for d8552ac
  

  Dmitri Dolguikh

  committed
  d8552ac

  Copy full SHA for d8552ac

• Fixing formatting

  Show description for e8033f7
  

  Dmitri Dolguikh

  committed
  e8033f7

  Copy full SHA for e8033f7

• Merge remote-tracking branch 'upstream/master' into xds-unification

  Show description for 9b699d1
  

  Dmitri Dolguikh

  committed
  9b699d1

  Copy full SHA for 9b699d1

Commits on Feb 5, 2021

• Merge remote-tracking branch 'upstream/main' into xds-unification

  Show description for 3089b99
  

  Dmitri Dolguikh

  committed
  3089b99

  Copy full SHA for 3089b99

• Merge remote-tracking branch 'upstream/main' into xds-unification

  Show description for 92e30c9
  

  Dmitri Dolguikh

  committed
  92e30c9

  Copy full SHA for 92e30c9

Commits on Feb 6, 2021

• Format fixes

  Show description for e62f5e1
  

  Dmitri Dolguikh

  committed
  e62f5e1

  Copy full SHA for e62f5e1