Commit 45bc2bc
committed
Merge origin/main into feat/ppe
Two conflicts, both resolved by keeping each side:
server/src/watcher.rs: this branch writes `*content_hash = new_hash` after a
successful reload (the hot-reload fix), main added a reload-success metric on
the same line. Both belong, state update first.
Cargo.lock: regenerated from main's side rather than hand-merged, then
re-resolved. The engine stays on the pinned revision.
Verified that praxis-proxy#912's route-scoped identity fix survived, since it touches the
policy filter this branch rewrote onto the engine: `route_ext` and the
`MetaExtension` stamping are present and its tests came across. 1851 filter
tests pass with `policy-engine` on, up from 1831.
Signed-off-by: Frederico Araujo <frederico.araujo@ibm.com>52 files changed
Lines changed: 3621 additions & 505 deletions
File tree
- .github/workflows
- benchmarks/microbenchmarks
- core/src
- config
- cluster
- docs
- filters
- http/traffic_management
- tcp/traffic_management
- proposals
- examples
- configs/traffic-management
- filter/src
- builtins
- http
- security/policy
- traffic_management
- circuit_breaker
- iterative_request_router
- load_balancer
- router
- tcp/traffic_management
- load_balancing
- protocol/src
- http/pingora
- handler
- request_filter
- health
- tcp
- server/src
- tests/integration/tests/suite
- examples
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
0 commit comments