Skip to content

Merge v3.33 into v3.34 #5384

Merge v3.33 into v3.34

Merge v3.33 into v3.34 #5384

Triggered via pull request January 28, 2025 09:36
@vlasebianvlasebian
opened #7488
Status Failure
Total duration 36s
Artifacts

mergeability.yml

on: pull_request_target
Check Mergeability
26s
Check Mergeability
Fit to window
Zoom out
Zoom in

Annotations

2 errors and 10 warnings
Check Mergeability
Process completed with exit code 1.
Check Mergeability
Process completed with exit code 1.
Check Mergeability: .golangci.yml#L1
.golangci.yml has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: DEVELOPMENT.md#L1
DEVELOPMENT.md has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: Dockerfile#L1
Dockerfile has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/applicationserver/config.go#L1
pkg/applicationserver/config.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/applicationserver/io/pubsub/redis/registry.go#L1
pkg/applicationserver/io/pubsub/redis/registry.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/applicationserver/io/web/redis/registry.go#L1
pkg/applicationserver/io/web/redis/registry.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/applicationserver/metadata/redis/location_cache.go#L1
pkg/applicationserver/metadata/redis/location_cache.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/gatewayserver/gatewayserver.go#L1
pkg/gatewayserver/gatewayserver.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/ttnpb/user.pb.go#L1
pkg/ttnpb/user.pb.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.
Check Mergeability: pkg/webui/console/components/total-end-devices-upseller-panel/index.js#L1
pkg/webui/console/components/total-end-devices-upseller-panel/index.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.34.