diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-25 20:26:39 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-10-25 20:26:39 +0000 |
| commit | 3e57daad5874a62cea100f204eb3c0e39d8eac7b (patch) | |
| tree | 01be433c45a3c4e504695cea7e49ea41e24a9556 | |
| parent | 74c0e758668d3daf2640fbd2198c5dd5ed2e0893 (diff) | |
| parent | 1e742878356c2b920d138fdad9883c3952c891e2 (diff) | |
| download | gitlab-ce-3e57daad5874a62cea100f204eb3c0e39d8eac7b.tar.gz | |
Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master'
Specify which Fog storage drivers are imported by default in backup_restore.md
Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5783
See merge request !7072
| -rw-r--r-- | doc/raketasks/backup_restore.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index fc0cd1b8af2..0ad84705cfd 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -85,8 +85,11 @@ Deleting old backups... [SKIPPING] Starting with GitLab 7.4 you can let the backup script upload the '.tar' file it creates. It uses the [Fog library](http://fog.io/) to perform the upload. -In the example below we use Amazon S3 for storage. -Fog also supports [other storage providers](http://fog.io/storage/). +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 +[also available](#uploading-to-locally-mounted-shares). For omnibus packages: |