Skip to content
Snippets Groups Projects
Commit 986f8271 authored by Alessandro Costantini's avatar Alessandro Costantini
Browse files

Merge branch 'master' into 'mitaka' 

# Conflicts:
#   Puppetfile
parents a9551d50 ceb045bf
Branches master
Tags 4.1.0
1 merge request!31Mitaka
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
Puppetfile
+ 1
− 1
View file @ 986f8271
......@@ -42,4 +42,4 @@ mod 'ocp-tools/mongodb',
# Modulo Zabbix AutomaticOCP
mod 'ocp-tools/zabbix',
:git => "https://baltig.infn.it/ocp-tools/zabbix.git",
:ref => '2.1.0'
:ref => '2.1.0'
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment