From f350e266930cc9a4c764b15867f7b11da7c675d8 Mon Sep 17 00:00:00 2001 From: Random-Liu Date: Wed, 21 Jun 2017 11:10:27 -0700 Subject: [PATCH 1/2] Add changelog for 0.26.1. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57982dd0..4ef4657f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +### 0.26.1 (2017-06-21) +- Fix prometheus metrics. + ### 0.26.0 (2017-05-31) - Fix disk partition discovery for brtfs - Add ZFS support From 062c4b00cede2c94628c0bd45790139886a862b5 Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Wed, 21 Jun 2017 15:54:58 -0700 Subject: [PATCH 2/2] thin-provisioning-tools moved to alpine main --- deploy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 9f1eef30..0ac646b3 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -5,7 +5,7 @@ ENV GLIBC_VERSION "2.23-r3" RUN apk --no-cache add ca-certificates wget device-mapper && \ apk --no-cache add zfs --repository http://dl-3.alpinelinux.org/alpine/edge/main/ && \ - apk --no-cache add thin-provisioning-tools --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ && \ + apk --no-cache add thin-provisioning-tools --repository http://dl-3.alpinelinux.org/alpine/edge/main/ && \ wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \ wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk && \ wget https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk && \