summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2017-11-01 08:20:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2017-11-01 08:20:04 +0000
commit55ecaa82a9a0e6972b4d05eb8f6bc0b742b3f8c2 (patch)
tree440d93cf2e7376b5e76b52c3260c57b10bd8da7e
parentReleasing debian version 20171017-1. (diff)
downloadopen-infrastructure-storage-tools-55ecaa82a9a0e6972b4d05eb8f6bc0b742b3f8c2.tar.xz
open-infrastructure-storage-tools-55ecaa82a9a0e6972b4d05eb8f6bc0b742b3f8c2.zip
Merging upstream version 20171101.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--CHANGELOG.txt7
-rw-r--r--VERSION.txt2
l---------share/ceph-info/web/ceph-versions.txt2
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 <daniel.baumann@open-infrastructure.net>
+
+ * Releasing version 20171101.
+
+ [ Daniel Baumann ]
+ * Correcting ceph-versions symlink in ceph-info.
+
2017-10-17 Daniel Baumann <daniel.baumann@open-infrastructure.net>
* 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