Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 33D6C175A2 for ; Fri, 4 Sep 2015 10:14:27 +0000 (UTC) Received: (qmail 77434 invoked by uid 500); 4 Sep 2015 10:14:27 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77364 invoked by uid 500); 4 Sep 2015 10:14:27 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 77349 invoked by uid 99); 4 Sep 2015 10:14:27 -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, 04 Sep 2015 10:14:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F2082E060D; Fri, 4 Sep 2015 10:14:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Fri, 04 Sep 2015 10:14:27 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843 Merge remote-tracking branch 'origin/ignite-843' into ignite-843 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/316b9421 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/316b9421 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/316b9421 Branch: refs/heads/ignite-843 Commit: 316b9421aad1ec45c5a59368eeb60be4222d6c68 Parents: 10a8b95 7ebc5fe Author: Andrey Authored: Fri Sep 4 17:15:11 2015 +0700 Committer: Andrey Committed: Fri Sep 4 17:15:11 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 44 ++++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/316b9421/modules/control-center-web/src/main/js/controllers/sql-controller.js ----------------------------------------------------------------------