summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-17 14:45:50 -0800
committerCorey Hulen <corey@hulen.com>2015-07-17 14:45:50 -0800
commitd65f199e12b19676bfac5e315ee634a8d3f05b88 (patch)
tree5d32f8193910f4a644e17a2c9d389ea3e01dffc0 /config
parentf1329787357544b1f4ecdf36586b93206d56832e (diff)
parent246d12aaf23fa3a2c23225b33a333effff76253b (diff)
downloadchat-d65f199e12b19676bfac5e315ee634a8d3f05b88.tar.gz
chat-d65f199e12b19676bfac5e315ee634a8d3f05b88.tar.bz2
chat-d65f199e12b19676bfac5e315ee634a8d3f05b88.zip
Merge pull request #185 from mattermost/mm-1348
fixes mm-1348 removing dependency on redis
Diffstat (limited to 'config')
-rw-r--r--config/config.json4
-rw-r--r--config/config_docker.json4
2 files changed, 0 insertions, 8 deletions
diff --git a/config/config.json b/config/config.json
index d5bb7e553..27ca57e86 100644
--- a/config/config.json
+++ b/config/config.json
@@ -31,10 +31,6 @@
"Trace": false,
"AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
},
- "RedisSettings": {
- "DataSource": "dockerhost:6379",
- "MaxOpenConns": 1000
- },
"AWSSettings": {
"S3AccessKeyId": "",
"S3SecretAccessKey": "",
diff --git a/config/config_docker.json b/config/config_docker.json
index 91ed0ef10..185e9f215 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -31,10 +31,6 @@
"Trace": false,
"AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
},
- "RedisSettings": {
- "DataSource": "localhost:6379",
- "MaxOpenConns": 1000
- },
"AWSSettings": {
"S3AccessKeyId": "",
"S3SecretAccessKey": "",