[*] Conflicts resolved (a6caed88) · Commits · cellframe / celllframe-node · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

celllframe-node
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

a6caed88

Commit a6caed88 authored 3 years ago by Roman Khlopkov

🔜

Downloads
- Plain Diff

[*] Conflicts resolved

parents be8bebcc 457b453a

No related branches found

No related tags found

1 merge request!272Feature 5173

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
CMakeLists.txt 15 additions, 6 deletions

CMakeLists.txt
README.md 9 additions, 3 deletions

README.md
cellframe-sdk 1 addition, 1 deletion

cellframe-sdk
dist.linux/share/cellframe-node.service 1 addition, 1 deletion

dist.linux/share/cellframe-node.service
dist/share/configs/cellframe-node.cfg.tpl 8 additions, 2 deletions

dist/share/configs/cellframe-node.cfg.tpl
prod_build 1 addition, 1 deletion

prod_build
python-cellframe 1 addition, 1 deletion

python-cellframe
scripts.darwin/create_configs.sh 1 addition, 0 deletions

scripts.darwin/create_configs.sh
scripts/create_configs_from_tpl.sh 6 additions, 6 deletions

scripts/create_configs_from_tpl.sh
sources/exh_win32.c 4 additions, 3 deletions

sources/exh_win32.c
sources/main.c 15 additions, 15 deletions

sources/main.c
sources/main_node_cli.c 12 additions, 3 deletions

sources/main_node_cli.c
sources/main_node_tool.c 15 additions, 4 deletions

sources/main_node_tool.c
sources/sig_unix_handler.c 12 additions, 7 deletions

sources/sig_unix_handler.c

with 104 additions and 56 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