Merge pull request #3094 from input-output-hk/release/1.2.1

Merge branch release/1.2.1 into master
input-output-hk · Jun 15, 2018 · 14f705d · 14f705d
2 parents bfbcda3 + a329628
commit 14f705d
Show file tree

Hide file tree

Showing 29 changed files with 122 additions and 91 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## Cardano SL 1.2.1 (Mainnet)
+
+Bug fix release.
+
+- The wallet launcher now uses a lock file. This prevents problems on
+  Windows if upgrading Daedalus while the old version is still
+  running. (DEVOPS-872)
+
+- Fix character encoding error in the connect script of the Docker
+  image. (DEVOPS-877)
+
+
 ## Cardano SL 1.2.0 (Mainnet)
 
 These are the most important code changes which were included in release 1.2.0.

diff --git a/auxx/cardano-sl-auxx.cabal b/auxx/cardano-sl-auxx.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-auxx
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - Auxx
 description:         Cardano SL - Auxx
 license:             MIT

diff --git a/binary/cardano-sl-binary.cabal b/binary/cardano-sl-binary.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-binary
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - binary serialization
 description:         This package defines a type class for binary serialization,
                      helpers and instances.

diff --git a/block/cardano-sl-block.cabal b/block/cardano-sl-block.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-block
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - block processing
 description:         Cardano SL - block processing
 license:             MIT

diff --git a/client/cardano-sl-client.cabal b/client/cardano-sl-client.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-client
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL client modules
 description:         Cardano SL client modules
 license:             MIT

diff --git a/core/cardano-sl-core.cabal b/core/cardano-sl-core.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-core
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - core
 description:         Cardano SL - core
 license:             MIT

diff --git a/crypto/cardano-sl-crypto.cabal b/crypto/cardano-sl-crypto.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-crypto
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - cryptography primitives
 description:         This package contains cryptography primitives used in Cardano SL.
 license:             MIT

diff --git a/db/cardano-sl-db.cabal b/db/cardano-sl-db.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-db
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - basic DB interfaces
 description:         Cardano SL - basic DB interfaces
 license:             MIT

diff --git a/delegation/cardano-sl-delegation.cabal b/delegation/cardano-sl-delegation.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-delegation
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - delegation
 description:         Cardano SL - delegation
 license:             MIT

diff --git a/explorer/cardano-sl-explorer.cabal b/explorer/cardano-sl-explorer.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-explorer
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano explorer
 description:         Please see README.md
 license:             MIT

diff --git a/generator/cardano-sl-generator.cabal b/generator/cardano-sl-generator.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-generator
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - arbitrary data generation
 description:         Cardano SL - arbitrary data generation
 license:             MIT

diff --git a/infra/cardano-sl-infra.cabal b/infra/cardano-sl-infra.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-infra
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - infrastructural
 description:         Cardano SL - infrastructural
 license:             MIT

diff --git a/lib/cardano-sl.cabal b/lib/cardano-sl.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL main implementation
 description:         Please see README.md
 license:             MIT

diff --git a/lib/configuration.yaml b/lib/configuration.yaml
@@ -14736,7 +14736,7 @@ mainnet_wallet_win64: &mainnet_wallet_win64
   <<: *mainnet_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 6
+    applicationVersion: 7
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 1
@@ -14746,7 +14746,7 @@ mainnet_wallet_macos64: &mainnet_wallet_macos64
   <<: *mainnet_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 6
+    applicationVersion: 7
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 1
@@ -14756,7 +14756,7 @@ mainnet_wallet_linux64: &mainnet_wallet_linux64
   <<: *mainnet_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 6
+    applicationVersion: 7
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 1
@@ -14781,7 +14781,7 @@ mainnet_dryrun_wallet_win64: &mainnet_dryrun_wallet_win64
   <<: *mainnet_dryrun_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 11
+    applicationVersion: 12
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 1
@@ -14791,7 +14791,7 @@ mainnet_dryrun_wallet_macos64: &mainnet_dryrun_wallet_macos64
   <<: *mainnet_dryrun_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 11
+    applicationVersion: 12
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 1
@@ -14801,7 +14801,7 @@ mainnet_dryrun_wallet_linux64: &mainnet_dryrun_wallet_linux64
   <<: *mainnet_dryrun_full
   update:
     applicationName: csl-daedalus
-    applicationVersion: 11
+    applicationVersion: 12
     lastKnownBlockVersion:
       bvMajor: 0
       bvMinor: 1

diff --git a/lrc/cardano-sl-lrc.cabal b/lrc/cardano-sl-lrc.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-lrc
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL - Leaders and Richmen computation
 description:         Cardano SL - Leaders and Richmen computation
 license:             MIT

diff --git a/networking/cardano-sl-networking.cabal b/networking/cardano-sl-networking.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-networking
-version:             1.2.0
+version:             1.2.1
 license:             MIT
 license-file:        LICENSE
 category:            Network

diff --git a/node/cardano-sl-node.cabal b/node/cardano-sl-node.cabal
@@ -1,5 +1,5 @@
 name:                cardano-sl-node
-version:             1.2.0
+version:             1.2.1
 synopsis:            Cardano SL simple node executable
 description:         Please see README.md
 license:             MIT