mirror of https://github.com/apache/superset.git
Fix the build (#5403)
The travis build has been failing for 2 reasons recently * pylint takes > 10 minutes without outputing * bad merge confict auto resolve in controls.jsx
This commit is contained in:
parent
22b7c2db62
commit
2eeff2ae0b
|
@ -4,5 +4,6 @@ mysqlclient==1.3.12
|
||||||
psycopg2==2.7.4
|
psycopg2==2.7.4
|
||||||
redis==2.10.6
|
redis==2.10.6
|
||||||
statsd==3.2.2
|
statsd==3.2.2
|
||||||
tox==2.9.1
|
tox==3.1.2
|
||||||
console_log==0.2.10
|
console_log==0.2.10
|
||||||
|
pylint==1.9.2
|
||||||
|
|
|
@ -208,7 +208,6 @@ export const controls = {
|
||||||
multi: true,
|
multi: true,
|
||||||
default: [],
|
default: [],
|
||||||
label: t('Percentage Metrics'),
|
label: t('Percentage Metrics'),
|
||||||
default: [],
|
|
||||||
validators: [],
|
validators: [],
|
||||||
description: t('Metrics for which percentage of total are to be displayed'),
|
description: t('Metrics for which percentage of total are to be displayed'),
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue