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

Merge branch 'release-0.1'

Browse Source
This commit is contained in:
Josh Tilles
2019-06-10 14:47:21 -04:00
parent 12da6336af dfa21f449b
commit df8a5b51b4
13 changed files with 557 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jsonnetfile.lock.json
View File

@@ -8,7 +8,11 @@
"subdir": "jsonnet/kube-prometheus"
}
},
<<<<<<< HEAD
"version": "107028fff38b6e3dce3e1ef110222474fb01b31c"
=======
"version": "e85d2f3b64c65f81aec7093dda880376a6719fe1"
>>>>>>> release-0.1
},
{
"name": "ksonnet",
@@ -28,7 +32,7 @@
"subdir": ""
}
},
"version": "ae58a33e85b191a8760a8d1bd8d3cda2fd046d05"
"version": "af494738e1709998696ffbce9296063a20c80692"
},
{
"name": "grafonnet",
@@ -38,7 +42,7 @@
"subdir": "grafonnet"
}
},
"version": "a6896d19aedc46ecf80dd64967191b9fd6f75f45"
"version": "bcd95ffa00fc4a58d34832f88f4b366effeb63ad"
},
{
"name": "grafana-builder",
@@ -48,7 +52,7 @@
"subdir": "grafana-builder"
}
},
"version": "a73d6c3e7f5804fc7a16f592b42a62384605046c"
"version": "de367fc28346fbf5a9afdef887ea20d9ffb7e927"
},
{
"name": "grafana",
@@ -58,7 +62,7 @@
"subdir": "grafana"
}
},
"version": "b6db6bdbdc8d7f2f8834a8044897ea6322a0f6ad"
"version": "c27d2792764867cdaf6484f067cc875cb8aef2f6"
},
{
"name": "prometheus-operator",
@@ -68,7 +72,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "7a25bf6b6bb2347dacb235659b73bc210117acc7"
"version": "18fbf558ab7f8809fd610a3dc50bf483508dc1bb"
},
{
"name": "etcd-mixin",
@@ -78,7 +82,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
"version": "919b93b742c76b12a83bdf8885fa75f11db6bcac"
"version": "d6280f9ea54849e5364545ca34bdac0a58317569"
}
]
}