Skip to content

Commit

Permalink
Merge branch 'hotfix/0.4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
howardjp committed Sep 26, 2021
2 parents 01d8154 + 7567ee7 commit 8d9b217
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cmake_minimum_required(VERSION 3.13) # GENERATOR_IS_MULTI_CONFIG

set(KAMI_VERSION_MAJOR 0)
set(KAMI_VERSION_MINOR 4)
set(KAMI_VERSION_PATCH 1)
set(KAMI_VERSION_PATCH 2)
set(KAMI_VERSION_STRING ${KAMI_VERSION_MAJOR}.${KAMI_VERSION_MINOR}.${KAMI_VERSION_PATCH})

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class KamiConan(ConanFile):
name = "kami"
version = "0.4.1"
version = "0.4.2"
license = "MIT"
author = "James P. Howard, II <[email protected]>"
url = "http://github.com/jhuapl/kami"
Expand Down
16 changes: 12 additions & 4 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
Changelog
=========

- :release:`0.4.2 <2021.09.25>`
- :bug:`0` Fixed Changelog to move docs to support
- :bug:`0` Fixed Changelog with current releases added

- :release:`0.4.1 <2021.09.25>`
- :bug:`0` Fixed README file links

- :release:`0.4.0 <2021.09.25>`
- :bug:`0` Cleaned up numerous issues found by CLion's linter
- :feature:`0` Added a new overview to the documents
- :feature:`0` Added basic installation instructions
- :support:`0` Added a new overview to the documents
- :support:`0` Added basic installation instructions
- :bug:`0` Retagged previous versions using pure Semantic Versioning
- :feature:`0` Documentation for `kami::RandomScheduler`
- :feature:`0` Added a changelog!
- :support:`0` Documentation for `kami::RandomScheduler`
- :support:`0` Added a changelog!

- :release:`0.3.0 <2021.09.20>`
- :feature:`0` Initial public release.
Expand Down
1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def configureDoxyfile(input_dir, output_dir):

# 'releases' (changelog) settings
releases_github_path = "JHUAPL/kami"
releases_unstable_prehistory = True

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

0 comments on commit 8d9b217

Please sign in to comment.