Commit b3bc2f9
committed
[merge party] merge main and bump multicast-tracking repo pins
Bump pins to track the multicast-enabled forks:
- maghemite zl/ddm-mcast tip
- softnpu zl/multicast tip
- propolis zl/multicast tip (already on multicast-e2e via main-merge)
Crucible stays on main's pin (7103cd3a). Restore the
progenitor_client010 / reqwest012_client dual-version pattern from
main. This keeps the retry helper and crucible callsites compiling
against crucible's 0.10 client while propolis-client is on 0.14.382 files changed
Lines changed: 20527 additions & 8457 deletions
File tree
- .github/buildomat/jobs
- clickhouse-admin
- api/src
- src
- types
- src
- versions
- src
- add_retention_policy_and_table_usage
- common
- src
- api/external
- dev-tools
- dropshot-apis/src
- ls-apis
- src
- bin
- tests
- output
- omdb
- src/bin/omdb
- db
- tests
- omicron-deployment-graph
- src
- reconfigurator-cli/tests
- input
- output
- releng/src
- dns-server
- tests
- transient/src
- gateway-types/versions/src/impls
- gateway/src
- illumos-utils/src
- installinator-api/src
- internal-dns/resolver/src
- nexus-config/src
- nexus
- db-fixed-data/src
- db-model/src
- db-queries
- src/db
- datastore
- queries
- tests/output
- db-schema/src
- examples
- external-api
- output
- src
- fm/src
- builder
- networking
- src
- reconfigurator
- blippy/src
- execution/src
- planning
- src
- blueprint_builder
- blueprint_editor
- planner
- tests
- integration_tests
- output
- src
- app
- background
- tasks
- sagas
- instance_update
- external_api
- test-utils/src
- tests
- integration_tests
- data_migrations
- types
- src
- deployment
- internal_api
- versions/src
- audit_log_auth_method_enum
- audit_log_credential_id
- bgp_unnumbered_peers
- impls
- initial
- manual_disk_adoption
- remove_duplicated_networking_types
- stronger_bgp_unnumbered_types
- ntp-admin/api/src
- openapi
- clickhouse-admin-keeper
- clickhouse-admin-server
- clickhouse-admin-single
- nexus
- sled-agent
- oximeter
- db
- src
- client
- sql
- test-output
- oximeter/schema
- producer-api
- src
- producer/src
- schema/src
- types
- src
- versions
- src
- add_joules
- impls
- initial
- schema/crdb
- add-disk-adoption-requests
- bgp-unnumbered-peer-cleanup
- blueprint-add-external-networking-generation
- delete-nexus-default-allow-firewall-rule
- drop-uninitialized-svc-enabled-not-online-state
- sled-agent
- api/src
- rack-setup
- src
- plan
- src
- bin
- bootstrap
- rack_setup
- sim
- types
- src
- versions
- src
- impls
- modify_svc_enabled_not_online_state
- stronger_bgp_unnumbered_types
- sp-sim/src
- tools
- scrimlet
- trust-quorum/gfss/src
- uuid-kinds/src
- wicketd/src
- workspace-hack
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 | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
246 | 246 | | |
247 | 247 | | |
248 | 248 | | |
249 | | - | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
250 | 258 | | |
251 | 259 | | |
252 | 260 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
0 commit comments