input-output-hk / cardano-ledger

61%

master: 63%

LAST BUILD ON BRANCH dnadales/787-conformance-tests-with-top-level-chain-predicate-failures

branch: dnadales/787-conformance-tests-with-top-level-chain-predicate-failures

CHANGE BRANCH

x

Reset

• dnadales/787-conformance-tests-with-top-level-chain-predicate-failures
• ruhatch/coveralls-token
• bors/staging
• master
• ruhatch/rename-keys
• ksaric/GH-144
• ruhatch/header-redesign
• ksaric/GH-144-new
• bors/trying
• ruhatch/delegation-bimap
• ruhatch/nix-files
• ruhatch/update-hedgehog
• nc/cons-int
• intricate/isNF-test
• update-logging-shell
• fix/504
• ruhatch/coveralls
• ruhatch/canonical-json
• ruhatch/relax-proposals
• nc/expose-stuff
• ruhatch/tasty-hedgehog
• ruhatch/iohk-nix
• ruhatch/hashkey
• jordan/shell-ledger-config-conversion
• ci/remove-obsolete-git-submodule
• dnadales-patch-1
• ruhatch/header-block-cbor
• ruhatch/negative-scale
• ruhatch/fix-generators
• avieth/export_renderBlock
• ruhatch/buildkite-nightly
• reduce-dependencies-by-cabal-flags
• ruhatch/chain-utxo
• erikd/better-failure-error
• ruhatch/utxo-gen
• ruhatch/header-hash-annotated
• ruhatch/proxy-signing
• erikd/cabal-project-constraints
• erikd/update-lts-13.24/ghc-8.6.5
• ruhatch/deleg-cert
• intricate/validation-modes
• intricate/header-body-proof
• ruhatch/slotid
• erikd/cabal-project
• intricate/514
• ruhatch/applicative-gens
• nc/ebb-int
• deepak/removeunused
• intricate/bimap-0.4.0-hackage
• ruhatch/buildable-tests
• ruhatch/hotfix
• update-logging-0.1.10.0
• staging
• erikd/drop-validate-mainnet
• mrBliss/cbor-chainvalidationstate
• 536-elaborate-update-payload
• andreas/increase-rich
• serge/accomodate-shell
• erikd/updates
• nc/genesis-tag
• avieth/bvd_annotation
• dnadales/derive-via-generic-monoid
• avieth/export_keyhash_constructor
• avieth/tmp_for_byron_proxy
• mdimjasevic/655-utxo-tx-order
• ruhatch/extract-epoch
• avieth/bvd_split
• intricate/export-headermatchesbody
• dcoutts/rename-cbor-utils
• dcoutts/sync-repo-version
• dnadales/536-conformance-test-with-update-payload
• mrBliss/cbor-utxovalidationerror
• avieth/slot_duration_parsing
• dcoutts/drop-aeson-instances
• dcoutts/utxo-config-lockedaddrs
• add-filter-source
• dcoutts/genesis-spec-generation
• erikd/update-20190809
• ksaric/GH-611
• erikd/unAddressHash
• mrBliss/genesis-config-memory-usage
• introduce-contra-tracer
• dandales/711-initial-scaffolding-invalid-chain-conformance-tests
• erikd/cabal.project
• intricate/fix-mempoolpayload
• dnadales/771-add-invalid-update-payload-to-conformance-tests
• serge/detailed-witness-validation-err
• mhuesch/stack-cabal_config_CI_check
• dnadales/771-test-with-invaid-vote-payload
• intricate/error-types-cbor
• intricate/strict-genesisdata
• intricate/strict-fromjson-avvm
• erikd/deps-20190916
• dnadales/622-keep-sw-update-metadata-in-ledger-state
• mhuesch/integrate-goblins
• erikd/deps-20190923
• update-monitoring-dependency
• edsko/no-thunks-instances
• edsko/fix-space-leaks
• dnadales/787-test-with-invalid-block-sizes
• erikd/deps-20190930
• dnadales/add-cache-for-buildkite
• intricate/force-whnf
• intricate/compact-rvk
• intricate/dlg-upd-id
• dnadales/conformance-tests-for-invalid-hashes
• intricate/rename-annotation
• dnadales/remove-signing-history
• mrBliss/999-prep
• dnadales/679-bump-cls-with-upvotes-discrepancy-fix
• erikd/deps-20191014
• dnadales/597-impossible-is-nothing
• mrBliss/expose-missing-test-modules
• dcoutts/remove-hd-derivation
• dcoutts/remove-unused-crypto
• redxaxder/new-annotatations-rebased
• erikd/deps-20191112
• erikd/deps-20191115
• redxaxder/walletapi
• redxaxder/aprotocolmagic
• erikd/is-redeem-address
• mhuesch/676_Byron_Aux_reorg
• nc/annotation-nonsense
• dcoutts/lovelaceportion-simplification
• dcoutts/lovelace-as-natural
• dcoutts/issue-cardano-node-461
• erikd/deps-20200113
• dcoutts/issue-cardano-node-461-v2
• dcoutts/tidy-mock-genesis-generation
• edsko/callstack
• edsko/blockstats
• redxaxder/676
• erikd/ataux-cbor
• erikd/deps-20200130
• erikd/deps-20200203
• jordan/generic-json-debugging
• nfrisby/issue-715-cvsLastSlot-isnt-currentSlot
• mrBliss/fix-space-leak-in-cvsLastSlot
• nc/txSize
• nc/api
• nc/license
• SRE-35_haskell_overhaul
• add_gzip_to_builtTools
• erikd/deps-20200225
• coot/encoded-sizes
• nc/txSizeTest
• erikd/unSigningKey
• jordan/remove-cryptonite-openssl
• mrBliss/avoid-thunks-in-candidateProtocolUpdates
• dcoutts/update-deps
• nc/issue-718
• redxaxder/707
• erikd/protomagic
• dcoutts/ebb-body-proof
• nc/issue-743
• intricate/doc-network-magic
• nc/issue756
• SRE-85_buildkite_regenerate
• dcoutts/hash-representation
• dcoutts/compact-utxo-conversion-perf
• erikd/deprecate
• nc/update-c-l-s
• nc/issue-759
• dcoutts/staging-null-update-proposal-exemption
• erikd/index-state
• erikd/deps-20200415
• erikd/adoptedProtocolParameters
• nc6-patch-1

Remove merge error.