Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gh 308: Merge develop #309

Merged
merged 14 commits into from
May 16, 2023
Merged

Gh 308: Merge develop #309

merged 14 commits into from
May 16, 2023

Conversation

t92549
Copy link
Contributor

@t92549 t92549 commented May 16, 2023 •
edited by github-actions bot
Loading

Related Issue

t92549 and others added 14 commits April 4, 2022 16:01
@t92549
gh-216: Ensure that uploading release artifacts waits for develop to …
e26dbe7 
…be updated (#217)
@t92549
gh-222: Change kind usages to use kubernetes 1.21 (#223)
8715205
@t92549
gh-225: Fix release action not seeing branch (#226)
828cd34
@ctas582
gh-98 Stop git from auto converting line endings on clone (#242)
61df018
@ctas582
gh-221 Support networking.k8s.io/v1/Ingress and networking.k8s.io/v1b…
e1c5729 
…eta1/Ingress (#247)

* gh-221 Support networking.k8s.io/v1/Ingress and networking.k8s.io/v1beta1/Ingress

* gh-221 Add tests
@t92549
Set kubernetes version to 1.24.4 in kind CI (#254)
1c9f9a9
@t92549
Gh 262 refactor integration tests (#263)
d143ec3 
* Updated teams notification
@t92549
Consolidate develop release workflow with v2-alpha (#288)
afcb16a
@t92549
Update Gaffer version to 1.23.0 (#293)
f449800
prepare release v1.1.0
5805ee3
prepare release v1.1.1
a5d1bbd
@t92549
Change base image to Ubuntu focal (#295)
bb8c1cb
@t92549
Gh 302: Cherry-pick CI (#299)
a258ba7
@t92549
Merge branch 'develop' into gh-308-merge-develop
78f99ed
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ t92549
✅ ctas582
❌ Gaffer

Gaffer seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@t92549 t92549 requested a review from GCHQDeveloper314 May 16, 2023 12:30
@t92549 t92549 merged commit 1c593ee into v2-alpha May 16, 2023
@t92549 t92549 deleted the gh-308-merge-develop branch May 16, 2023 12:55
@t92549 t92549 linked an issue May 16, 2023 that may be closed by this pull request
Merge develop into v2-alpha #308
Closed
@t92549 t92549 mentioned this pull request May 16, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GCHQDeveloper314 GCHQDeveloper314 GCHQDeveloper314 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge develop into v2-alpha
4 participants
@t92549 @CLAassistant @GCHQDeveloper314 @ctas582