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 A254418E14 for ; Wed, 3 Feb 2016 10:56:28 +0000 (UTC) Received: (qmail 77341 invoked by uid 500); 3 Feb 2016 10:56:28 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77246 invoked by uid 500); 3 Feb 2016 10:56:28 -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 75646 invoked by uid 99); 3 Feb 2016 10:56: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; Wed, 03 Feb 2016 10:56:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9906E3831; Wed, 3 Feb 2016 10:56:27 +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: Wed, 03 Feb 2016 10:57:13 -0000 Message-Id: <918552f08f8a46cda212fb59ae0f4f13@git.apache.org> In-Reply-To: <82f91f145d694e2d823222746a654e15@git.apache.org> References: <82f91f145d694e2d823222746a654e15@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2 Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0deca4c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0deca4c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0deca4c2 Branch: refs/heads/ignite-843-rc3 Commit: 0deca4c2382b09a9f9ea082b76183d6ed46be267 Parents: f2a0bc3 0d14a01 Author: Alexey Kuznetsov Authored: Wed Feb 3 17:35:15 2016 +0700 Committer: Alexey Kuznetsov Committed: Wed Feb 3 17:35:15 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/app/modules/terms/main.js | 2 +- .../src/main/js/controllers/sql-controller.js | 16 ++++++++++------ .../control-center-web/src/main/js/routes/agent.js | 10 +++++++--- 3 files changed, 18 insertions(+), 10 deletions(-) ----------------------------------------------------------------------