aboutsummaryrefslogtreecommitdiffstats
path: root/doc/DEPLOY.md
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-02-15 17:40:04 +1100
committerHenare Degan <henare.degan@gmail.com>2013-02-15 17:59:06 +1100
commita0f250204a376ce97a187cf8a9b2cb0b8c628298 (patch)
tree812504a7b8da2431b3fed6f38f6796cdbbc84e00 /doc/DEPLOY.md
parent8f1caab7990dc417e32b14cbb5f00c34a0ddc10c (diff)
parentd16f2f8242352a2d3c0350275110453dd6ac6b12 (diff)
Merge branch 'develop' into rails-3-spike
Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb
Diffstat (limited to 'doc/DEPLOY.md')
-rw-r--r--doc/DEPLOY.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md
index 767f720fd..f2e643ec5 100644
--- a/doc/DEPLOY.md
+++ b/doc/DEPLOY.md
@@ -20,7 +20,6 @@ These are the general steps required to get your staging server up and running:
* SSH to the server, change to the `deploy_to` directory
* `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml`
* `cp releases/[SOME_DATE]/config/database.yml-example shared/database.yml`
-* `cp releases/[SOME_DATE]/config/memcached.yml-example shared/memcached.yml`
* Edit those files to match your required settings
* Back on your machine run `cap deploy` and it should successfully deploy
* Run the DB migrations `cap deploy:migrate`