From 5b0d2dd8f9e7719215d6cfb878738221585a5e3f Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 23 Jul 2015 10:15:53 -0800 Subject: Fixing merges for latest postgres --- config/config.json | 4 ++-- config/config_docker.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index 591e38422..cfb3c2de8 100644 --- a/config/config.json +++ b/config/config.json @@ -35,8 +35,8 @@ }, "SqlSettings": { "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test", - "DataSourceReplicas": ["mmuser:mostest@tcp(dockerhost:3306)/mattermost_test"], + "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8", + "DataSourceReplicas": ["mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8"], "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, diff --git a/config/config_docker.json b/config/config_docker.json index a9ed98f1a..2d5a34539 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -35,8 +35,8 @@ }, "SqlSettings": { "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test", - "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test"], + "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8", + "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8"], "MaxIdleConns": 10, "MaxOpenConns": 10, "Trace": false, -- cgit v1.2.3-1-g7c22