Merge #735

735: Release 1.9.1 r=dcoutts a=dcoutts Minor update that includes fixes in the NTP client. Co-authored-by: Duncan Coutts <[email protected]>
IntersectMBO · Mar 28, 2020 · f9d541c · f9d541c
2 parents d250ba4 + 3f05675
commit f9d541c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 30 deletions.
diff --git a/cabal.project b/cabal.project
@@ -200,99 +200,99 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-network-testing
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-consensus/ouroboros-consensus-mock
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-consensus-byron
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-consensus-shelley
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-consensus-cardano
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: ouroboros-network-framework
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: io-sim-classes
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 690e825b13560e64d970474214891d34e65a62a5
-  --sha256: 0bn01flk8vypjd2mjrflx3mk0gxh7a1xxd393b4kjyx3cdi7yqsk
+  tag: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
+  --sha256: 1sa8fks5i1sya3qxfl97cagl2w9hjjbfk3s3ghr0fprrgv3ls2lf
   subdir: Win32-network
 
 source-repository-package

diff --git a/cardano-node/ChangeLog.md b/cardano-node/ChangeLog.md
@@ -1,5 +1,19 @@
 # Changelog for cardano-node
 
+## 1.9.1 -- March 2020
+
+### node changes
+- CLI support for submitting Byron era update proposals (#714)
+
+### consensus changes
+- None.
+
+### ledger changes
+- None.
+
+### network changes
+- Fix failures in the NTP client on Windows (#1862, 1865)
+
 ## 1.9.0 -- March 2020
 
 ### node changes

diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -1,5 +1,5 @@
 name:                  cardano-node
-version:               1.9.0
+version:               1.9.1
 description:           The cardano full node
 author:                IOHK
 maintainer:            [email protected]

diff --git a/stack.yaml b/stack.yaml
@@ -122,7 +122,7 @@ extra-deps:
     #Ouroboros-network dependencies
 
   - git: https://github.com/input-output-hk/ouroboros-network
-    commit: 690e825b13560e64d970474214891d34e65a62a5
+    commit: ffcc4fad05ef888a7c0ed8ff662ee4478484d1da
     subdirs:
         - io-sim
         - io-sim-classes