[incubator-superset] 01/01: Merge pull request #4833 from timifasubaa/help_sqllab_forget_the_past

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

timi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git

commit d87504cb42b4fe05c698feaed579340a2335a261
Merge: 8933365 ab958c6
Author: timifasubaa <30...@users.noreply.github.com>
AuthorDate: Mon May 7 10:56:39 2018 -0700

    Merge pull request #4833 from timifasubaa/help_sqllab_forget_the_past
    
    [sqllab] Help sqllab forget query history

 .../src/SqlLab/components/QueryAutoRefresh.jsx     | 11 +++++---
 superset/assets/src/SqlLab/reducers.js             |  5 +---
 superset/db_engine_specs.py                        |  2 +-
 superset/views/core.py                             | 31 +++++++++++++++++++++-
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --cc superset/views/core.py
index 0359cae,6a357db..d290ecc
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@@ -23,10 -23,9 +23,10 @@@ from flask_appbuilder.security.decorato
  from flask_babel import gettext as __
  from flask_babel import lazy_gettext as _
  import pandas as pd
 +import simplejson as json
  from six import text_type
  import sqlalchemy as sqla
- from sqlalchemy import create_engine
+ from sqlalchemy import and_, create_engine, update
  from sqlalchemy.engine.url import make_url
  from sqlalchemy.exc import IntegrityError
  from unidecode import unidecode

-- 
To stop receiving notification emails like this one, please contact
timi@apache.org.