From 55ecaa82a9a0e6972b4d05eb8f6bc0b742b3f8c2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 1 Nov 2017 09:20:04 +0100 Subject: Merging upstream version 20171101. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 7 +++++++ VERSION.txt | 2 +- share/ceph-info/web/ceph-versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 62e817c..f620881 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,10 @@ +2017-11-01 Daniel Baumann + + * Releasing version 20171101. + + [ Daniel Baumann ] + * Correcting ceph-versions symlink in ceph-info. + 2017-10-17 Daniel Baumann * Releasing version 20171017. diff --git a/VERSION.txt b/VERSION.txt index 47e14c9..0c5aadd 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20171017 +20171101 diff --git a/share/ceph-info/web/ceph-versions.txt b/share/ceph-info/web/ceph-versions.txt index cc77481..bb9d86e 120000 --- a/share/ceph-info/web/ceph-versions.txt +++ b/share/ceph-info/web/ceph-versions.txt @@ -1 +1 @@ -/var/log/storage-tools/ceph-log/ceph-versions.txt \ No newline at end of file +/var/log/storage-tools/ceph-info/ceph-versions.txt \ No newline at end of file -- cgit v1.2.3