merge branch 'master' into docs-site

This commit is contained in:
Ben Klein
2015-12-03 15:16:13 -06:00
36 changed files with 384 additions and 155 deletions

View File

@@ -45,7 +45,7 @@ The connector will check for:
* a `CLEARDB_DATABASE_URL` config var with value using the scheme `mysql`
==== Redis (Redis To Go, Redis Cloud, RedisGreen, openredis)
==== Redis (Redis To Go, Redis Cloud, RedisGreen, openredis, Heroku Redis)
The connector will check for:
@@ -53,6 +53,7 @@ The connector will check for:
* a `REDISCLOUD_URL` config var with value using the scheme `redis`
* an `OPENREDIS_URL` config var with value using the scheme `redis`
* a `REDISGREEN_URL` config var with value using the scheme `redis`
* a `REDIS_URL` config var with value using the scheme `redis`
==== MongoDB (MongoLab, MongoHQ, MongoSoup)