diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-01-06 19:09:49 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-01-06 19:09:49 +0000 |
| commit | f77f736ba40c6ba967531592ec48dd3e2cec1ebc (patch) | |
| tree | 91a42de8535f54a35540d02ac2099878f358c130 /doc | |
| parent | 6ca4b6a38d42e6299208216618ed8ad72f65783a (diff) | |
| parent | c73bcca27ccc26e835e587e16a81aba9813dafdf (diff) | |
| download | gitlab-ce-f77f736ba40c6ba967531592ec48dd3e2cec1ebc.tar.gz | |
Merge branch 'support-google-cloud-storage-backups' into 'master'
Re-add Google Cloud Storage as a backup strategy
Closes #26362
See merge request !8481
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/raketasks/backup_restore.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index f42bb6a81a2..43ddc419054 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, OpenStack Swift and Rackspace as well. A local driver is +for AWS, Google, OpenStack Swift and Rackspace as well. A local driver is [also available](#uploading-to-locally-mounted-shares). For omnibus packages: |