summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-11-24 17:36:48 +0000
committerStan Hu <stanhu@gmail.com>2016-11-24 17:36:48 +0000
commite2f66373ff4ba09ca9b881be53c5ddd061a590f0 (patch)
tree842d47cf27509a8116492a6cb668243952c2e95b /doc
parent035fb37131ad7a52a3113d102ecf7f2a0b1dddaf (diff)
parent2749c1b5687bb50b980dc7bfc1d3471ea16f1ccf (diff)
downloadgitlab-ce-e2f66373ff4ba09ca9b881be53c5ddd061a590f0.tar.gz
Merge branch 'remove-backup-strategies' into 'master'
Stop supporting Google Cloud and Azure as backup strategies ## What does this MR do? It removes support for Azure and Google Cloud as backup strategies (via Fog). Motivation behind this decision can be found in !4928, !6713 but basically they require a lot of gems that are unrelated to the backup use-case. ## Are there points in the code the reviewer needs to double check? Am I missing any other location where we'd use these gems? See merge request !7739
Diffstat (limited to 'doc')
-rw-r--r--doc/raketasks/backup_restore.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 7484bc2295e..17485b11c09 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -88,7 +88,7 @@ It uses the [Fog library](http://fog.io/) to perform the upload.
In the example below we use Amazon S3 for storage, but Fog also lets you use
[other storage providers](http://fog.io/storage/). GitLab
[imports cloud drivers](https://gitlab.com/gitlab-org/gitlab-ce/blob/30f5b9a5b711b46f1065baf755e413ceced5646b/Gemfile#L88)
-for AWS, Azure, Google, OpenStack Swift and Rackspace as well. A local driver is
+for AWS, OpenStack Swift and Rackspace as well. A local driver is
[also available](#uploading-to-locally-mounted-shares).
For omnibus packages: