Skip to content

Commit

Permalink
chore(release): cut open enterprise agent 1.23.0 release
Browse files Browse the repository at this point in the history 
* Change resource defaults for postgres ([#827](#827)) ([87809c4](87809c4))
* correct OAS example ([#816](#816)) ([b1384b3](b1384b3))
* Swithing to startupProbe from Readiness ([#821](#821)) ([22a78ec](22a78ec))

* complete the integration with anoncred and fixes ([#820](#820)) ([15ff710](15ff710))
* Liveness, and readiness probes ([#817](#817)) ([6e18666](6e18666))
* Tune postgresql - helm chart ([#822](#822)) ([5fcd9fb](5fcd9fb))

Signed-off-by: Anton Baliasnikov <anton.baliasnikov@iohk.io>
Signed-off-by: Shota Jolbordi <shota.jolbordi@iohk.io>
  • Loading branch information
@atala-dev
atala-dev authored and Shota Jolbordi committed Mar 18, 2024
1 parent 84ed5f4 commit 4b483f4
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tmp.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
git checkout --ours -- . # Resolve conflicts by accepting current changes
git add . # Stage the resolved conflicts
git rebase --continue

0 comments on commit 4b483f4

Please sign in to comment.