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 53C76173DE for ; Fri, 3 Apr 2015 13:03:49 +0000 (UTC) Received: (qmail 26556 invoked by uid 500); 3 Apr 2015 13:03:49 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 26521 invoked by uid 500); 3 Apr 2015 13:03:49 -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 26512 invoked by uid 99); 3 Apr 2015 13:03:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2015 13:03:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 03 Apr 2015 13:03:19 +0000 Received: (qmail 21326 invoked by uid 99); 3 Apr 2015 13:03:16 -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; Fri, 03 Apr 2015 13:03:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D59B4E18FD; Fri, 3 Apr 2015 13:03:16 +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: Fri, 03 Apr 2015 13:03:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/50] incubator-kylin git commit: Merge branch 'streaming-localdict' of https://github.com/KylinOLAP/Kylin into streaming-localdict X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'streaming-localdict' of https://github.com/KylinOLAP/Kylin into streaming-localdict Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/8e313886 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/8e313886 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/8e313886 Branch: refs/heads/streaming-localdict Commit: 8e313886a5679ae35e8df2e3e5c5ec0eaa48095f Parents: 5d2cc1f 95a3e79 Author: qianhao.zhou Authored: Thu Apr 2 17:22:41 2015 +0800 Committer: qianhao.zhou Committed: Thu Apr 2 17:22:41 2015 +0800 ---------------------------------------------------------------------- bin/kylin.sh | 4 ++-- examples/test_case_data/sandbox/kylin.properties | 10 +++++++++- .../apache/kylin/job/hadoop/cubev2/InMemCuboidJob.java | 12 ------------ 3 files changed, 11 insertions(+), 15 deletions(-) ----------------------------------------------------------------------