Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

K

key-storage-agent
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

451e81f5

Commit 451e81f5 authored 5 years ago by Alisa Dinaburg

Downloads
- Plain Diff

Merge branch 'master' into '20-zerolog-for-json-logging'

# Conflicts:
#   handler/handler.go
#   utils/utils.go

parents 13cd1a1d 66893cb3

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 0 additions, 1 deletion

.gitlab-ci.yml
handler/generate_keypair.go 36 additions, 50 deletions

handler/generate_keypair.go
handler/handler.go 29 additions, 64 deletions

handler/handler.go
handler/manage_device_key.go 45 additions, 44 deletions

handler/manage_device_key.go
server/server.go 6 additions, 1 deletion

server/server.go
utils/utils.go 24 additions, 30 deletions

utils/utils.go

with 140 additions and 190 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