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 9146C18D24 for ; Tue, 25 Aug 2015 16:54:41 +0000 (UTC) Received: (qmail 17883 invoked by uid 500); 25 Aug 2015 16:54:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17852 invoked by uid 500); 25 Aug 2015 16:54:41 -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 17843 invoked by uid 99); 25 Aug 2015 16:54:41 -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; Tue, 25 Aug 2015 16:54:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0C08E0260; Tue, 25 Aug 2015 16:54:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Tue, 25 Aug 2015 16:54:41 -0000 Message-Id: <035fdba98ab646e195b1e7105b0fc9ef@git.apache.org> 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/6b4f5d8b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b4f5d8b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b4f5d8b Branch: refs/heads/ignite-843 Commit: 6b4f5d8ba59923da4e4150b63a8feada21ce0a66 Parents: ba9713f 0ed9172 Author: AKuznetsov Authored: Tue Aug 25 23:54:33 2015 +0700 Committer: AKuznetsov Committed: Tue Aug 25 23:54:33 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 4 +- .../main/js/controllers/metadata-controller.js | 10 +- .../main/js/controllers/models/metadata.json | 3 + .../main/js/routes/generator/generator-xml.js | 125 +++++++++++-------- 4 files changed, 84 insertions(+), 58 deletions(-) ----------------------------------------------------------------------