Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

devops-workshop
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a2395c46

Commit a2395c46 authored 4 years ago by student

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/maikebre/devops-workshop

Task 4 done through Ubuntu, 250 User load test
Merge caused by some change

parents 347946d9 49e4bed3

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 3
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/resources/CalculatorResource.java 0 additions, 4 deletions

src/main/java/resources/CalculatorResource.java
src/main/webapp/js/settings.js 15 additions, 1 deletion

src/main/webapp/js/settings.js
src/test/java/UserResourceTest.java 2 additions, 2 deletions

src/test/java/UserResourceTest.java

with 17 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