Skip to content

Commit 8d9b217

Browse files
committed
Merge branch 'hotfix/0.4.2'
2 parents 01d8154 + 7567ee7 commit 8d9b217

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cmake_minimum_required(VERSION 3.13) # GENERATOR_IS_MULTI_CONFIG
2929

3030
set(KAMI_VERSION_MAJOR 0)
3131
set(KAMI_VERSION_MINOR 4)
32-
set(KAMI_VERSION_PATCH 1)
32+
set(KAMI_VERSION_PATCH 2)
3333
set(KAMI_VERSION_STRING ${KAMI_VERSION_MAJOR}.${KAMI_VERSION_MINOR}.${KAMI_VERSION_PATCH})
3434

3535
################################################################################

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
class KamiConan(ConanFile):
55
name = "kami"
6-
version = "0.4.1"
6+
version = "0.4.2"
77
license = "MIT"
88
author = "James P. Howard, II <[email protected]>"
99
url = "http://github.com/jhuapl/kami"

docs/changelog.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
Changelog
22
=========
33

4+
- :release:`0.4.2 <2021.09.25>`
5+
- :bug:`0` Fixed Changelog to move docs to support
6+
- :bug:`0` Fixed Changelog with current releases added
7+
8+
- :release:`0.4.1 <2021.09.25>`
9+
- :bug:`0` Fixed README file links
10+
11+
- :release:`0.4.0 <2021.09.25>`
412
- :bug:`0` Cleaned up numerous issues found by CLion's linter
5-
- :feature:`0` Added a new overview to the documents
6-
- :feature:`0` Added basic installation instructions
13+
- :support:`0` Added a new overview to the documents
14+
- :support:`0` Added basic installation instructions
715
- :bug:`0` Retagged previous versions using pure Semantic Versioning
8-
- :feature:`0` Documentation for `kami::RandomScheduler`
9-
- :feature:`0` Added a changelog!
16+
- :support:`0` Documentation for `kami::RandomScheduler`
17+
- :support:`0` Added a changelog!
1018

1119
- :release:`0.3.0 <2021.09.20>`
1220
- :feature:`0` Initial public release.

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def configureDoxyfile(input_dir, output_dir):
4848

4949
# 'releases' (changelog) settings
5050
releases_github_path = "JHUAPL/kami"
51+
releases_unstable_prehistory = True
5152

5253
# Add any paths that contain templates here, relative to this directory.
5354
templates_path = ['_templates']

0 commit comments

Comments
 (0)