Commit 3e57daad authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

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
parents 74c0e758 1e742878
...@@ -85,8 +85,11 @@ Deleting old backups... [SKIPPING] ...@@ -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. 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. It uses the [Fog library](http://fog.io/) to perform the upload.
In the example below we use Amazon S3 for storage. In the example below we use Amazon S3 for storage, but Fog also lets you use
Fog also supports [other storage providers](http://fog.io/storage/). [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: For omnibus packages:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment