Merge branch 'dev'

Esty Thomas · Esty Thomas · commit 12c22d3c7a30 · 2020-05-04T09:15:28.000-04:00
diff --git a/combine/localsettings.py.docker b/combine/localsettings.py.docker
@@ -112,7 +112,7 @@ METADATA_PREFIXES = {
 
 # Database configurations for use in Spark context
 COMBINE_DATABASE = {
-	'jdbc_url':'jdbc:mysql://mysql:3306/combine',
+	'jdbc_url':'jdbc:mysql://mysql:3307/combine',
 	'user':settings.DATABASES['default']['USER'],
 	'password':settings.DATABASES['default']['PASSWORD']
 }
@@ -172,6 +172,6 @@ DATABASES = {
         'USER': 'combine',
         'PASSWORD': 'combine',
         'HOST': 'mysql',
-        'PORT': '3306',
+        'PORT': '3307',
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ METADATA_PREFIXES = {`
`112`	`112`
`113`	`113`	`# Database configurations for use in Spark context`
`114`	`114`	`COMBINE_DATABASE = {`
`115`		`- 'jdbc_url':'jdbc:mysql://mysql:3306/combine',`
	`115`	`+ 'jdbc_url':'jdbc:mysql://mysql:3307/combine',`
`116`	`116`	`'user':settings.DATABASES['default']['USER'],`
`117`	`117`	`'password':settings.DATABASES['default']['PASSWORD']`
`118`	`118`	`}`
`@@ -172,6 +172,6 @@ DATABASES = {`
`172`	`172`	`'USER': 'combine',`
`173`	`173`	`'PASSWORD': 'combine',`
`174`	`174`	`'HOST': 'mysql',`
`175`		`- 'PORT': '3306',`
	`175`	`+ 'PORT': '3307',`
`176`	`176`	`}`
`177`	`177`	`}`