From commits-return-526-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Wed Jan 17 22:54:49 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 7AFCC18066D for ; Wed, 17 Jan 2018 22:54:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6B01D160C25; Wed, 17 Jan 2018 21:54:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B2AF2160C35 for ; Wed, 17 Jan 2018 22:54:48 +0100 (CET) Received: (qmail 65674 invoked by uid 500); 17 Jan 2018 21:54:47 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 65665 invoked by uid 99); 17 Jan 2018 21:54:47 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2018 21:54:47 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 68E65820E8; Wed, 17 Jan 2018 21:54:47 +0000 (UTC) Date: Wed, 17 Jan 2018 21:54:47 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] branch master updated: [bugfix] time_pivot entry got missing in merge conflict (#4221) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151622608727.1945.9288153123504703524@gitbox.apache.org> From: maximebeauchemin@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5897d85f7a0296686e3e972f8155bce3200da594 X-Git-Newrev: a9610e288691a22063abd19404e32c393ef2847f X-Git-Rev: a9610e288691a22063abd19404e32c393ef2847f X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. maximebeauchemin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-superset.git The following commit(s) were added to refs/heads/master by this push: new a9610e2 [bugfix] time_pivot entry got missing in merge conflict (#4221) a9610e2 is described below commit a9610e288691a22063abd19404e32c393ef2847f Author: Maxime Beauchemin AuthorDate: Wed Jan 17 13:54:45 2018 -0800 [bugfix] time_pivot entry got missing in merge conflict (#4221) PR here https://github.com/apache/incubator-superset/pull/3518 missed a line of code while merging conflicts with time_pivot viz --- superset/assets/visualizations/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/superset/assets/visualizations/main.js b/superset/assets/visualizations/main.js index 7cb040b..a455cf8 100644 --- a/superset/assets/visualizations/main.js +++ b/superset/assets/visualizations/main.js @@ -31,6 +31,7 @@ export const VIZ_TYPES = { sunburst: 'sunburst', table: 'table', time_table: 'time_table', + time_pivot: 'time_pivot', treemap: 'treemap', country_map: 'country_map', word_cloud: 'word_cloud', -- To stop receiving notification emails like this one, please contact ['"commits@superset.apache.org" '].