Sync master to dev - Githubissues

hardillb commented 1 year ago

Syncing the dev branch to the current master (before adding updates for 3.1.x beta releases)

Might have to do this manually with a force push, but opening this to see if we can do it by resolving the conflicts.

linux-foundation-easycla[bot] commented 1 year ago

:white_check_mark: login: hardillb / name: Ben Hardill (e3adc4136fd260017e86448dfa522e34c5fc23c4, e5321d86c057ae4895bd2dddc1ad12fdc3305fcb, 0b784adb9142a2830a982ef7401a4328308a7ffd, b5430889ae0a38abeba66a3ff69033d00ef6d4ef, 3d9a2a5037c592ba09f07ca19ae1db32b2ac40f8, 3d02ac51c8d58ec8507b2e96befd8a6bc4b344d1, da99564055d30c3fca1c8cfec527f414d7b00d21, b335cb8788aa454b6e89c3be964329e8729c8817, 8f6d7f49a8ac324aaa88216501005e0230834156, db48d08b9c88abea207711ac1a7c552f5e964cc6, c070a5199efe6efaabf129c413e39cd4bf48dfe4, 650a552522b351691667ce71d1a2b0b9b0fb4423, 2ad7e7b01bf8bac78913bb4f52b4100be9aa292d, 5ae42893e3b1269e5ce9d6f95a6fba5f17f047b2)
:white_check_mark: login: knolleary / name: Nick O'Leary (cc3ee589f24d92680815aa5cebd03f0ce1d746be, acb78e96ba2aaa98e1d7afd9c8b60976afc85f7e, a3adfc1c55e550b8abe706de6c14a120f5648d97, 6df9b772e3efc20c976384f32624cfc03ea95c90)
:white_check_mark: login: dschmidt / name: Dominik Schmidt (1e5924adc194afcd6d84681d5957b2da67517be0)
:x: - login: @NodeREDBot . The commit (33a03c513bd543d4016d667ab29501c3eda45018) is not authorized under a signed CLA. Please click here to be authorized. For further assistance with EasyCLA, please submit a support request ticket.

hardillb commented 1 year ago

OK, resolved the conflicts, just got to ignore the CLA (it's only the Node-RED bot), if we merge this we can then merge the debian build PR #346 and do a 3.1.0-beta build to test everything

node-red / node-red-docker

Sync master to dev #350