Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DA0C11F1E for ; Wed, 9 Jul 2014 12:52:13 +0000 (UTC) Received: (qmail 67151 invoked by uid 500); 9 Jul 2014 12:52:13 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 67124 invoked by uid 500); 9 Jul 2014 12:52:13 -0000 Mailing-List: contact dev-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 dev@brooklyn.incubator.apache.org Received: (qmail 67108 invoked by uid 99); 9 Jul 2014 12:52:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2014 12:52:12 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,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; Wed, 09 Jul 2014 12:52:14 +0000 Received: (qmail 66980 invoked by uid 99); 9 Jul 2014 12:51:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2014 12:51:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 523409A9556; Wed, 9 Jul 2014 12:51:48 +0000 (UTC) From: aledsage To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: Improvements to the jsgui catalog... Content-Type: text/plain Message-Id: <20140709125148.523409A9556@tyr.zones.apache.org> Date: Wed, 9 Jul 2014 12:51:48 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Github user aledsage commented on the pull request: https://github.com/apache/incubator-brooklyn/pull/51#issuecomment-48465379 @sjcorbett this contains merge conflicts - could you rebase against master please? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---