Skip to content

Commit 5bc0d24

Browse files
committed
Update documentation
1 parent 5162038 commit 5bc0d24

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
1515

1616
### Fixed
1717

18+
* Remove -werror compiler flag to fix failing build with clang ([#184](https://github.com/cucumber/cucumber-cpp/pull/184) Kamil Strzempowicz)
19+
* Add missing virtual destructor in base class SocketServer used by TCPSocketServer and UnixSocketServer ([#183](https://github.com/cucumber/cucumber-cpp/pull/183) Matthieu Longo)
20+
* Fix breaking changes in API of boost-1.66.0 ([#180](https://github.com/cucumber/cucumber-cpp/pull/180) Matthieu Longo)
21+
* Fix conflicting "using std" declaration with "using boost::thread" ([#181](https://github.com/cucumber/cucumber-cpp/pull/181) Matthieu Longo)
22+
* Fix building with boost > 1.64 by adding 2 new methods to BoostLogInterceptor ([#175](https://github.com/cucumber/cucumber-cpp/pull/175) Kamil Strzempowicz)
1823
* Fixing Visual Studio 2013 error: no appropriate default constructor available ([#188](https://github.com/cucumber/cucumber-cpp/pull/188) Antoine Allard)
1924
* Fix issue #81 by intercepting messages from BOOST_*_MESSAGE macros ([#164](https://github.com/cucumber/cucumber-cpp/pull/164) Kamil Strzempowicz)
2025
* Allow running all GTest cases without filter separation ([#144](https://github.com/cucumber/cucumber-cpp/pull/144) Giel van Schijndel)

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Here is an [Example](https://github.com/cucumber/bool/pull/12) of this process i
5555
- To merge:
5656
- Follow the command line instructions on GitHub
5757
- If it is either a new feature or a bugfix, specify the `--no-commit`
58-
flag when merging and add a line to `HISTORY.md` following the
58+
flag when merging and add a line to `CHANGELOG.md` following the
5959
current convention. Add this file to the changes to be committed and
6060
commit the merge.
6161
- Commit message should follow the current convention:
@@ -64,11 +64,11 @@ Here is an [Example](https://github.com/cucumber/bool/pull/12) of this process i
6464
### Do a release
6565

6666
- Release commit (e.g. [fdf8a5c](https://github.com/cucumber/cucumber-cpp/commit/fdf8a5c4ef4c51dfa7ea82077f706414a4c6322d)):
67-
- Change `HISTORY.md` renaming the "In Git" section with the
67+
- Change `CHANGELOG.md` renaming the "In Git" section with the
6868
release number and date
6969
- Commit with message `Updated history file for the X.Y release`
7070
- Create an annotated tag for this commit named `vX.Y`
7171
- New development branch commit (e.g. [da60995](https://github.com/cucumber/cucumber-cpp/commit/da609956fcd42046e5182c6226acd7e53dd7754e)):
72-
- Add new "In Git" section to `HISTORY.md`
72+
- Add new "In Git" section to `CHANGELOG.md`
7373
- Commit with message `Preparing history file for next development release`
7474
- Push commits and tags to master

0 commit comments

Comments
 (0)