Skip to content
Snippets Groups Projects
Verified Commit 21dc4f5c authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-filesystem

parents c2a37d16 578f4df5
Branches
Tags
3 merge requests!42Release 0.2.0,!39F remove boost rdep,!34F grpc f acm
Pipeline #18703 failed
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(libcaosdb_VERSION 0.1.0) set(libcaosdb_VERSION 0.2.0)
set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0)
set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 7) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 7)
set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 1) set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 1)
......
...@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools ...@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
class CaosdbConan(ConanFile): class CaosdbConan(ConanFile):
name = "caosdb" name = "caosdb"
version = "0.1.0" version = "0.2.0-dev"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
author = "Timm C. Fitschen <t.fitschen@indiscale.com>" author = "Timm C. Fitschen <t.fitschen@indiscale.com>"
url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git" url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git"
......
...@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file. ...@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security
## [0.1.0 - 2021-12-11] ## [0.1.0 - 2021-12-11]
Initial Release. Initial Release.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment