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:
Matthias Loibl
2019-05-29 17:56:09 +02:00
parent 107028fff3
commit eea692c190
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": "107028fff38b6e3dce3e1ef110222474fb01b31c"
"version": "bedeadb7f5686537b7733096dcbb86ab0f722ce8"
=======
"version": "c5c70e2101c29818d350a3b90ae0e417a5602507"
>>>>>>> Remove extra ksonnet4 dependency
}, },
{ {
"name": "ksonnet", "name": "ksonnet",