Merge pull request #10531 from scuttlemonkey/master

Add UK mirror and update copyright
ceph · Aug 1, 2016 · 63c88a7 · 63c88a7
2 parents 4a90e64 + 4f2f79c
commit 63c88a7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/doc/conf.py b/doc/conf.py
@@ -2,7 +2,7 @@
 import os
 
 project = u'Ceph'
-copyright = u'2010-2014, Inktank Storage, Inc. and contributors. Licensed under Creative Commons BY-SA'
+copyright = u'2016, Red Hat, Inc, and contributors. Licensed under Creative Commons BY-SA'
 version = 'dev'
 release = 'dev'
 

diff --git a/doc/install/mirrors.rst b/doc/install/mirrors.rst
@@ -21,6 +21,7 @@ These mirrors are available on the following locations:
 - **DE: Germany**: http://de.ceph.com/
 - **HK: Hong Kong**: http://hk.ceph.com/
 - **FR: France**: http://fr.ceph.com/
+- **UK: UK**: http://uk.ceph.com
 - **US-East: US East Coast**: http://us-east.ceph.com/
 - **US-West: US West Coast**: http://us-west.ceph.com/
 

diff --git a/mirroring/MIRRORS b/mirroring/MIRRORS
@@ -7,3 +7,4 @@ cz.ceph.com: Tomáš Kukrál <kukratom@fit.cvut.cz>
 us-east.ceph.com: Tyler Bishop <tyler.bishop@beyondhosting.net>
 hk.ceph.com: Mart van Santen <mart@greenhost.nl>
 fr.ceph.com: Adrien Gillard <gillard.adrien@gmail.com>
+uk.ceph.com: Tim Bishop <T.D.Bishop@kent.ac.uk>