Merge pull request #4307 from rjbou/210-alpha3-changes

2.1.0~alpha3 changelog
ocaml · Aug 7, 2020 · a407508 · a407508
2 parents fe33dd9 + 6310956
commit a407508
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,21 @@ repositories (changes that are automatically handled by the format upgrade tools
 are not marked). Those prefixed with "(+)" are new command/option (since
 2.1.0~alpha2).
 
+2.1.0~alpha3:
+* Confirmation on non-compiler switch invariant: not on dryrun, Y by default
+  [#4289 @AltGr]
+* (*) Fix pin kind automatic detection consistency [#4300 @rjbou]: With `opam
+  pin target', when opam file is not versioned and at root, vcs-pin the package
+  instead of path-pin, and with `opam pin add nv target', take opam file even
+  if not versioned.
+* External dependencies: Fix non-interactive mode on OpenSuse [#4293
+  @kit-ty-kate]
+* src-ext: bump topkg to 1.0.2 and dune to 2.6.2, with a second compiler
+  built in case main one is < 4.07.0 (dune restriction) [#4294 @dra27]
+* Allow Z3 backend to return sub-optimal solutions on timeout, add
+  `OPAMSOLVERALLOWSUBOPTIMAL` environment variable [#4289 @AltGr]
+* Add an optional solver relying on opam-0install-cudf [#4240 @kit-ty-kate]
+
 2.1.0~alpha2:
 * Remove m4 from the list of recommended tools [#4184 @kit-ty-kate]
 * Fix config solver field ignored at init [#4243 @rjbou - fix #4241]

diff --git a/master_changes.md b/master_changes.md
@@ -16,12 +16,10 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## Switch
-  * Confirmation on non-compiler switch invariant: not on dryrun, Y by default [#4289 @AltGr]
+  *
 
 ## Pin
-  * Fix pin kind automatic detection consistency [#4300 @rjbou]
-    * With `opam pin target`, when opam file is not versioned and at root, vcs-pin the package instead of path-pin
-    * With `opam pin add nv target`, take opam file even if not versioned
+  *
 
 ## List
   *
@@ -39,7 +37,7 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## External dependencies
-  * Fix non-interactive mode on OpenSuse [#4293 @kit-ty-kate]
+  *
 
 ## Sandbox
   *
@@ -48,8 +46,7 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## Build
-  * src-ext: bump topkg to 1.0.2 and dune to 2.6.2, with a second compiler built in case main one is < 4.07.0 (dune restriction) [#4294 @dra27]
-  * Bump to 2.1.0~alpha3 version [#4299 @rjbou]
+  *
 
 ## Infrastructure
   *
@@ -64,8 +61,7 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## Solver
-  * Allow Z3 backend to return sub-optimal solutions on timeout, add `OPAMSOLVERALLOWSUBOPTIMAL` environment variable [#4289 @AltGr]
-  * Add an optional solver relying on opam-0install-cudf [#4240 @kit-ty-kate]
+  *
 
 ## Internal
   *
@@ -74,4 +70,4 @@ New option/command/subcommand are prefixed with ◈.
   *
 
 ## Doc
-  * Add repology badges on distribution page [#4304 @rjbou]
+  *