Skip to content
Snippets Groups Projects
Commit 3bf360df authored by yasinhessnawi's avatar yasinhessnawi
Browse files

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	src/main/java/resources/CalculatorResource.java
parents 7f5d1668 59eaa67a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
glances.conf
+ 1
− 1
View file @ 3bf360df
...@@ -355,7 +355,7 @@ prefix=localhost ...@@ -355,7 +355,7 @@ prefix=localhost
[influxdb2] [influxdb2]
# NOTE: localhost will NOT work here! # NOTE: localhost will NOT work here!
host=INSERT_IP_TO_VM_HERE host=129.241.97.126
port=8086 port=8086
protocol=http protocol=http
org=ntnu org=ntnu
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment