Skip to content

Commit c617191

Browse files
iohk-bors[bot]cootangermandisassembler
authored
Merge #4891
4891: coot/ouroboros network 0.3.0.1 r=disassembler a=coot - Require ouroboros-network-0.3.0.1 - Updated cardano-node changelog file for 1.35.6 release Co-authored-by: Marcin Szamotulski <[email protected]> Co-authored-by: Moritz Angermann <[email protected]> Co-authored-by: Samuel Leathers <[email protected]>
2 parents 037542e + 8c06bf9 commit c617191

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

.github/workflows/haskell.yml

+6
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@ jobs:
128128
if: runner.os == 'Linux'
129129
run: sudo apt-get -y install autoconf automake libtool
130130

131+
# macOS doesn't come with pkg-config out of the box.
132+
- name: "MAC: Install pkg-config (brew)"
133+
if: runner.os == 'macOS'
134+
run: |
135+
brew install pkg-config
136+
131137
- name: "MAC: Install build environment (brew)"
132138
if: runner.os == 'macOS'
133139
run: |

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state: 2022-09-27T18:00:00Z
16-
index-state: cardano-haskell-packages 2023-01-26T18:00:00Z
16+
index-state: cardano-haskell-packages 2023-02-16T13:42:30Z
1717

1818
packages:
1919
cardano-api

cardano-node/ChangeLog.md

+20-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Changelog for cardano-node
22

3-
## 1.35.5 -- January 2023
3+
## 1.35.6 -- Febuary 2023
44

5-
### node changes
5+
### consensus changes
66

77
None
88

9-
### consensus changes
9+
### ledger changes
1010

1111
None
1212

@@ -25,13 +25,30 @@ None
2525
format will be supported for next two major releases of the node (the last
2626
major version which will support it is `1.37`). (#4563)
2727

28+
- Fixed a tight loop when demoting a peer from hot to warm timeouts
29+
(input-output-hk/ouroboros-network#4357).
30+
2831
[#4563]: https://github.com/input-output-hk/cardano-node/issues/4563
2932
[understanding-config-files]: https://github.com/input-output-hk/cardano-node/blob/master/doc/getting-started/understanding-config-files.md
3033

34+
## 1.35.5 -- January 2023
35+
36+
### node changes
37+
38+
None
39+
40+
### consensus changes
41+
42+
None
43+
3144
### ledger changes
3245

3346
None
3447

48+
### network changes
49+
50+
None
51+
3552
## 1.35.4 -- October 2022
3653

3754
### node changes

cardano-node/cardano-node.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ library
169169
, ouroboros-consensus-cardano ^>= 0.2
170170
, ouroboros-consensus-protocol
171171
, ouroboros-consensus-shelley
172-
, ouroboros-network ^>= 0.3
172+
, ouroboros-network ^>= 0.3.0.1
173173
, ouroboros-network-framework ^>= 0.2
174174
, psqueues
175175
, safe-exceptions

cardano-submit-api/cardano-submit-api.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ common mtl { build-depends: mtl
3333
common network { build-depends: network >= 3.1.2.1 }
3434
common optparse-applicative-fork { build-depends: optparse-applicative-fork >= 0.16.1.0 }
3535
common ouroboros-consensus-cardano { build-depends: ouroboros-consensus-cardano >= 0.1.0.0 }
36-
common ouroboros-network { build-depends: ouroboros-network >= 0.3.0.0 }
36+
common ouroboros-network { build-depends: ouroboros-network >= 0.3.0.1 }
3737
common prometheus { build-depends: prometheus >= 2.2.2 }
3838
common protolude { build-depends: protolude >= 0.3.0 }
3939
common servant { build-depends: servant >= 0.18.2 }

flake.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)