Skip to content

Commit

Permalink
Merge branch 'master' into fix-mdx-hint
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanReb authored Jul 30, 2020
2 parents 64dc237 + 5f947d7 commit c39eaca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ next
- Fix crash when evaluating an `mdx` stanza that depends on unavailable
packages. (#3650, @CraigFe)

- Fix typo in `cache-check-probablity` field in dune config files. This field
now requires 2.7 as it wasn't usable before this version. (#3652, @edwintorok)

2.6.1 (02/07/2020)
------------------

Expand Down
4 changes: 2 additions & 2 deletions src/dune/config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ let decode =
(Dune_lang.Syntax.since Stanza.syntax (2, 0) >>> Caching.Transport.decode)
~default:default.cache_transport
and+ cache_check_probability =
field "cache-check-probablity"
(Dune_lang.Syntax.since Stanza.syntax (2, 0) >>> Dune_lang.Decoder.float)
field "cache-check-probability"
(Dune_lang.Syntax.since Stanza.syntax (2, 7) >>> Dune_lang.Decoder.float)
~default:default.cache_check_probability
and+ cache_duplication =
field "cache-duplication"
Expand Down

0 comments on commit c39eaca

Please sign in to comment.