From commits-return-18937-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Wed Feb 21 22:49:14 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2125718067E for ; Wed, 21 Feb 2018 22:49:13 +0100 (CET) Received: (qmail 74128 invoked by uid 500); 21 Feb 2018 21:49:13 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 74119 invoked by uid 99); 21 Feb 2018 21:49:13 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Feb 2018 21:49:13 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A6EB385B8C; Wed, 21 Feb 2018 21:49:12 +0000 (UTC) Date: Wed, 21 Feb 2018 21:49:13 +0000 To: "commits@airavata.apache.org" Subject: [airavata] 01/01: Merge branch 'registry-refactoring' into group-based-auth MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: machristie@apache.org In-Reply-To: <151924975248.14015.3348166647616190703@gitbox.apache.org> References: <151924975248.14015.3348166647616190703@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/group-based-auth X-Git-Reftype: branch X-Git-Rev: 9c7fa9930d42149df3722d3bbd86295e77f929b2 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180221214912.A6EB385B8C@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch group-based-auth in repository https://gitbox.apache.org/repos/asf/airavata.git commit 9c7fa9930d42149df3722d3bbd86295e77f929b2 Merge: cda2c82 53e684e Author: Marcus Christie AuthorDate: Wed Feb 21 16:49:05 2018 -0500 Merge branch 'registry-refactoring' into group-based-auth .../registry/core/entities/appcatalog/ComputeResourceEntity.java | 6 +++--- .../core/repositories/appcatalog/ComputeResourceRepositoryTest.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact machristie@apache.org.