Merge v3.28 in v3.29 #4098
Annotations
2 errors and 10 warnings
|
|
|
|
|
.goreleaser.release.yml#L1
.goreleaser.release.yml has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
CODEOWNERS#L1
CODEOWNERS has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
cypress/e2e/console/gateways/create.spec.js#L1
cypress/e2e/console/gateways/create.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
cypress/e2e/console/integrations/pub-subs/create.spec.js#L1
cypress/e2e/console/integrations/pub-subs/create.spec.js has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
pkg/console/console.go#L1
pkg/console/console.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
pkg/gatewayconfigurationserver/http.go#L1
pkg/gatewayconfigurationserver/http.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
pkg/gatewayconfigurationserver/v2/server.go#L1
pkg/gatewayconfigurationserver/v2/server.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
pkg/gatewayserver/gatewayserver.go#L1
pkg/gatewayserver/gatewayserver.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
pkg/gatewayserver/io/ws/ws.go#L1
pkg/gatewayserver/io/ws/ws.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
|
pkg/identityserver/rights.go#L1
pkg/identityserver/rights.go has a conflict when merging TheThingsIndustries/lorawan-stack:v3.29.
|
The logs for this run have expired and are no longer available.
Loading