Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

[DEVOPS-998] Merge release/1.3.1 into develop #3542

Closed
wants to merge 66 commits into from

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Sep 5, 2018

Pull hotfixes and features from release/1.3.1 into develop.

Ben Ford and others added 30 commits August 7, 2018 10:23
Also document the processWithdrawls function
Add the --ekg-server commandline option
* Config parameter has changed to "recaptcha-secret-file"
* The actual secret is now a field in FaucetEnv
Also adds a couple of tests for readCaptchaSecret
cleverca22 and others added 14 commits August 17, 2018 13:24
…rev-release-1.3.1

[DEVOPS-999] explorer frontend: Replace @gitrev@ with actual rev
In the banner of cardano-sl-explorer-frontend, rather than "TN 0.5",
just have "Testnet".
…kport-release

[DEVOPS-992] Fix x509 generator SANs to work with IP addresses
[RCD-28] handle IOExceptions in retrievalWorker
…ntend-testnet

[DEVOPS-398] explorer frontend: reword Testnet banner
Changing to the working directory before starting cardano-node allows
other paths (nodeDbPath in particular) to be supplied as relative
paths. This allows us to work around unicode bugs in rocksdb.
…us-safe-mode

[DDW-380] Configure launcher to read/write safe mode parameter
…g-dir

[CBR-391] launcher: add a workingDir setting to the launcher config
@rvl rvl requested review from commandodev, erikd, tatyanavych and a team September 5, 2018 10:41
@commandodev
Copy link
Contributor

I've just opened #3541 at @erikd's request to get the faucet merged into develop... Maybe we should have a chat tomorrow morning/this evening to discuss which approach we want to take?

@rvl
Copy link
Contributor Author

rvl commented Sep 5, 2018

You could have CC'd me on the PR.
The thing is that the Daedalus team and others are rather keen to get the fixes from the release branch merged back to develop, rather than wait for deliberations to conclude about which way is best.
Hence this PR.

@rvl rvl force-pushed the devops-998-merge-release-1.3.1 branch from 17f9606 to b4ebb33 Compare September 5, 2018 13:39
@commandodev
Copy link
Contributor

Sorry - you're right, I should have added you as well as @erikd. This is the diff between my PR and this one:

33 files changed, 164 insertions(+), 193 deletions(-)
auxx/cardano-sl-auxx.cabal                        |   2 +-
binary/cardano-sl-binary.cabal                    |   2 +-
binary/test/cardano-sl-binary-test.cabal          |   2 +-
client/cardano-sl-client.cabal                    |   2 +-
core/cardano-sl-core.cabal                        |   2 +-
core/test/cardano-sl-core-test.cabal              |   2 +-
crypto/cardano-sl-crypto.cabal                    |   2 +-
crypto/test/cardano-sl-crypto-test.cabal          |   2 +-
db/cardano-sl-db.cabal                            |   2 +-
explorer/cardano-sl-explorer.cabal                |   2 +-
explorer/frontend/src/Explorer/Util/Config.purs   |   3 +
explorer/frontend/src/Explorer/View/Common.purs   |   3 +-
faucet/cardano-sl-faucet.cabal                    |   4 +-
faucet/src/Cardano/Faucet/Init.hs                 |  26 ++--
faucet/src/Cardano/Faucet/Types/API.hs            |   4 +-
faucet/test/Spec.hs                               |   2 +-
generator/cardano-sl-generator.cabal              |   2 +-
infra/cardano-sl-infra.cabal                      |   2 +-
infra/test/cardano-sl-infra-test.cabal            |   2 +-
lib/cardano-sl.cabal                              |   2 +-
lib/src/Pos/Network/Block/Retrieval.hs            |   1 +
networking/cardano-sl-networking.cabal            |   2 +-
networking/src/Network/Broadcast/OutboundQueue.hs |   4 +-
node/cardano-sl-node.cabal                        |   2 +-
pkgs/default.nix                                  |  48 +++----
stack.yaml                                        |   1 -
tools/cardano-sl-tools.cabal                      |   2 +-
tools/src/launcher/Main.hs                        | 157 +++++++++-------------
util/cardano-sl-util.cabal                        |   2 +-
util/src/Pos/Util/Log/Scribes.hs                  |  62 ++++-----
util/test/cardano-sl-util-test.cabal              |   2 +-
wallet-new/cardano-sl-wallet-new.cabal            |   2 +-
wallet/cardano-sl-wallet.cabal                    |   2 +-

Copy link
Contributor

@tatyanavych tatyanavych left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK with the content though I did not review the code

@rvl rvl closed this Sep 7, 2018
@rvl rvl deleted the devops-998-merge-release-1.3.1 branch September 12, 2018 05:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants