easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update kube-prometheus self-dependency

Browse Source
This commit is contained in:
Josh Tilles
2019-06-10 14:48:06 -04:00
parent df8a5b51b4
commit f4d7270c53
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsonnetfile.lock.json
View File

@@ -8,11 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
<<<<<<< HEAD "version": "df8a5b51b4e05fc7ba1a168346a80cbc9bec48d3"
"version": "107028fff38b6e3dce3e1ef110222474fb01b31c"
=======
"version": "e85d2f3b64c65f81aec7093dda880376a6719fe1"
>>>>>>> release-0.1
}, },
{ {
"name": "ksonnet", "name": "ksonnet",