Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nomad-FAIR
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

a0ebc684

Commit a0ebc684 authored 4 years ago by Markus Scheidgen

Downloads
- Plain Diff

Merge branch 'v0.9.11' into v0.10.0

parents a39461bd 0384e472

Branches

Tags

2 merge requests!283Merge v0.10.0 into master for release,!280Parser move

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

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

.gitlab-ci.yml
dependencies/parsers/vasp 1 addition, 1 deletion

dependencies/parsers/vasp
docs/developers.md 2 additions, 9 deletions

docs/developers.md
nomad/gitinfo.py 0 additions, 1 deletion

nomad/gitinfo.py
ops/helm/nomad/templates/api-deployment.yaml 2 additions, 2 deletions

ops/helm/nomad/templates/api-deployment.yaml
requirements.txt 2 additions, 1 deletion

requirements.txt
tests/test_search.py 1 addition, 1 deletion

tests/test_search.py

with 12 additions and 15 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