Skip to content

Commit

Permalink
Prep for 2.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
MJJoyce committed Dec 16, 2020
1 parent 2554ee2 commit 0f67dd1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [2.0.1](https://github.com/NASA-AMMOS/AIT-Core/compare/2.0.0...2.0.1)
## [2.1.0](https://github.com/NASA-AMMOS/AIT-Core/compare/2.0.1...2.1.0)

### Merged

- Issue #306 - Support lists in config directory expansion [`#312`](https://github.com/NASA-AMMOS/AIT-Core/pull/312)
- Issue #300 - Fix cfg import in db.py [`#301`](https://github.com/NASA-AMMOS/AIT-Core/pull/301)

## [2.0.1](https://github.com/NASA-AMMOS/AIT-Core/compare/2.0.0...2.0.1) - 2020-10-12

### Merged

Expand All @@ -21,6 +28,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### Commits

- Update CHANGELOG for 2.0.1 [`dc4dfbd`](https://github.com/NASA-AMMOS/AIT-Core/commit/dc4dfbde1d7829e8743dc03d3248cdbb0a8999d9)
- Issue #290 update server port config example in doc [`bfe1417`](https://github.com/NASA-AMMOS/AIT-Core/commit/bfe141762983cbc8a2ad519ceacb61acdc73acab)
- Updated Logging info [`2636107`](https://github.com/NASA-AMMOS/AIT-Core/commit/2636107aef90f4729273c4d988a6686a3ca23e27)
- Prep for 2.0.1 release [`ad0645b`](https://github.com/NASA-AMMOS/AIT-Core/commit/ad0645b3f3aa367138aab81fbf8a99050745fd6c)
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
# built documents.
#
# The short X.Y version.
version = u'2.0.1'
version = u'2.1.0'
# The full version, including alpha/beta/rc tags.
release = u'2.0.1'
release = u'2.1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def run(self):

setup(
name = 'ait-core',
version = '2.0.1',
version = '2.1.0',
description = description,
long_description = long_description,
long_description_content_type = 'text/x-rst',
Expand Down

0 comments on commit 0f67dd1

Please sign in to comment.