fastforward to apache/master

This commit is contained in:
Hugh Miles
2018-01-24 17:05:57 -08:00
parent 36956a5d24
commit 63cbcb80c3
26 changed files with 278 additions and 85 deletions

View File

@@ -294,7 +294,7 @@ function mapStateToProps(state) {
return {
datasource: state.datasource,
errorMessage: state.errorMessage,
timeout: state.common ? state.common.SUPERSET_WEBSERVER_TIMEOUT : null,
timeout: state.common ? state.common.conf.SUPERSET_WEBSERVER_TIMEOUT : null,
};
}