Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-cpplib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

cb540be3

Verified Commit cb540be3 authored 3 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' into f-mixed-write-transactions

parents bb42875c 2ce0e458

No related branches found

No related tags found

1 merge request!26F mixed write transactions

Pipeline #14296 passed 3 years ago

Stage: info

Stage: setup

Stage: test

Stage: deploy

Pipeline: caosdb-cppinttest

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
CMakeLists.txt 2 additions, 0 deletions

CMakeLists.txt
Makefile 2 additions, 2 deletions

Makefile
conanfile.py 5 additions, 1 deletion

conanfile.py
doc/README_SETUP.md 3 additions, 2 deletions

doc/README_SETUP.md
src/caosdb/file_transmission/file_reader.cpp 1 addition, 1 deletion

src/caosdb/file_transmission/file_reader.cpp
src/caosdb/file_transmission/file_writer.cpp 1 addition, 1 deletion

src/caosdb/file_transmission/file_writer.cpp

with 15 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment