diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-01 20:27:30 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-01 20:27:30 +0300 |
| commit | 8e47ca1411778a76dd02a7433d339499fc1a22fe (patch) | |
| tree | 0c41e77b35099c62d27ae7c9994f429ec8dcd3aa /doc | |
| parent | 97d6085fb507d53f92699d5cfea06dd319125994 (diff) | |
| parent | 3c00df82903770ae6f4cbd9b2e60aa82421512e6 (diff) | |
Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master'
Add fog-aliyun as backup storage provider
See merge request !11849
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 5be6053b76e..855f437cd73 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -133,7 +133,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, Google, OpenStack Swift and Rackspace as well. A local driver is +for AWS, Google, OpenStack Swift, Rackspace and Aliyun as well. A local driver is [also available](#uploading-to-locally-mounted-shares). For omnibus packages, add the following to `/etc/gitlab/gitlab.rb`: |