Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A1A117AE9 for ; Sun, 26 Apr 2015 04:42:46 +0000 (UTC) Received: (qmail 17172 invoked by uid 500); 26 Apr 2015 04:42:46 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 17138 invoked by uid 500); 26 Apr 2015 04:42:46 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 17129 invoked by uid 99); 26 Apr 2015 04:42:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Apr 2015 04:42:45 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Apr 2015 04:42:40 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 12EA043E48 for ; Sun, 26 Apr 2015 04:41:38 +0000 (UTC) Received: (qmail 15667 invoked by uid 99); 26 Apr 2015 04:41:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Apr 2015 04:41:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5ACB0E2F77; Sun, 26 Apr 2015 04:41:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.incubator.apache.org Date: Sun, 26 Apr 2015 04:41:53 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/43] incubator-kylin git commit: Merge pull request #456 from janzhongi/ori_staging X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #456 from janzhongi/ori_staging KYLIN-695 Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9304cb24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9304cb24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9304cb24 Branch: refs/heads/master Commit: 9304cb24fbe968e82ebfbeeae4a3b1c4efad7a99 Parents: 37f44f8 d4d7cef Author: Zhong,Jian Authored: Thu Apr 16 18:03:18 2015 +0800 Committer: Zhong,Jian Committed: Thu Apr 16 18:03:18 2015 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubes.js | 4 ++++ webapp/app/partials/cubes/cubes.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------