[airavata] 01/01: Merge branch 'registry-refactoring' into group-based-auth

[machristie]

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 9755a1b9bb1cf3a93fe5762fce729b835964d683
Merge: 6a45f36 74a9b79
Author: Marcus Christie 
AuthorDate: Thu Feb 22 16:04:10 2018 -0500

Merge branch 'registry-refactoring' into group-based-auth

 .../entities/appcatalog/StoragePreferenceEntity.java | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
machris...@apache.org.

[airavata] 01/01: Merge branch 'registry-refactoring' into group-based-auth

[machristie]

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 6a45f36ea8e3eb4bdc6364ae1a41243e40533007
Merge: 97f03cc 5a3575b
Author: Marcus Christie 
AuthorDate: Thu Feb 22 12:21:54 2018 -0500

Merge branch 'registry-refactoring' into group-based-auth

 .../registry/core/entities/appcatalog/GatewayProfileEntity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
machris...@apache.org.

[airavata] 01/01: Merge branch 'registry-refactoring' into group-based-auth

[machristie]

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
machris...@apache.org.

[airavata] 01/01: Merge branch 'registry-refactoring' into group-based-auth

[machristie]

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 cda2c82d28f0bc5009005da129148412b45884a9
Merge: a782fd7 1da4d8e
Author: Marcus Christie 
AuthorDate: Wed Feb 21 14:27:02 2018 -0500

Merge branch 'registry-refactoring' into group-based-auth

 .../registry/core/utils/JPAUtil/AppCatalogJPAUtils.java| 14 +-
 .../src/main/resources/META-INF/persistence.xml|  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
machris...@apache.org.