Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-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 C905497EF for ; Tue, 9 Dec 2014 10:31:04 +0000 (UTC) Received: (qmail 97057 invoked by uid 500); 9 Dec 2014 10:31:04 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 97034 invoked by uid 500); 9 Dec 2014 10:31:04 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 97025 invoked by uid 99); 9 Dec 2014 10:31:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 10:31:04 +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; Tue, 09 Dec 2014 10:30:42 +0000 Received: (qmail 96788 invoked by uid 99); 9 Dec 2014 10:30:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 10:30:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 856BEA20068; Tue, 9 Dec 2014 10:30:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: richard@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 09 Dec 2014 10:30:43 -0000 Message-Id: <6afcbd568e024ab98f4daebb21c8824c@git.apache.org> In-Reply-To: <79352afc75ac44ec9d189a5f148d22bb@git.apache.org> References: <79352afc75ac44ec9d189a5f148d22bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-brooklyn git commit: Merge and close #371 X-Virus-Checked: Checked by ClamAV on apache.org Merge and close #371 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f2e1cb58 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f2e1cb58 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f2e1cb58 Branch: refs/heads/master Commit: f2e1cb589b920eed5026522513c2b15cd35ef8c9 Parents: 0493d63 3602114 Author: Richard Downer Authored: Mon Dec 8 16:44:55 2014 +0000 Committer: Richard Downer Committed: Mon Dec 8 16:44:55 2014 +0000 ---------------------------------------------------------------------- .../main/webapp/assets/js/libs/ZeroClipboard.swf | Bin 1891 -> 0 bytes .../src/main/webapp/assets/js/view/entity-config.js | 2 +- .../main/webapp/assets/js/view/entity-sensors.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------