Merge branch '2.6' into stable

cvmfs · Aug 13, 2019 · 87b843a · 87b843a
2 parents bb7749c + 39e184b
commit 87b843a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/conf.py b/conf.py
@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = u'2.6'
 # The full version, including alpha/beta/rc tags.
-release = u'2.6.1'
+release = u'2.6.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/cpt-quickstart.rst b/cpt-quickstart.rst
@@ -46,15 +46,15 @@ To install the CVMFS package run
 
 ::
 
-    sudo dnf install https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.6.1/cvmfs-2.6.1-1.fc29.x86_64.rpm https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm
+    sudo dnf install https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.6.2/cvmfs-2.6.2-1.fc29.x86_64.rpm https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm
 
 OpenSUSE
 ~~~~~~~~
 To install the CVMFS package run
 
 ::
 
-    zypper install https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.6.1/cvmfs-2.6.1-1.suse1320.x86_64.rpm https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm
+    zypper install https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.6.2/cvmfs-2.6.2-1.suse1320.x86_64.rpm https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-default-latest.noarch.rpm
 
 
 Mac OS X

diff --git a/cpt-releasenotes.rst b/cpt-releasenotes.rst
@@ -1,3 +1,11 @@
+Release Notes for CernVM-FS 2.6.2
+=================================
+
+CernVM-FS 2.6.2 is a patch release.  It fixes a rare block during hotpatch
+introduced with version 2.6.1
+(`CVM-1795 <https://sft.its.cern.ch/jira/browse/CVM-1795>`_).  Otherwise it is
+identical to version 2.6.1.
+
 Release Notes for CernVM-FS 2.6.1
 =================================