resolving conflicts with upstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/63a797b7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/63a797b7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/63a797b7 Branch: refs/heads/develop Commit: 63a797b7b1857ac81d0271b953a10da9b2729f1c Parents: e478ba6 28ab7a4 Author: Anuj Bhandar <[email protected]> Authored: Thu Apr 27 15:28:14 2017 -0400 Committer: Anuj Bhandar <[email protected]> Committed: Thu Apr 27 15:28:14 2017 -0400 ---------------------------------------------------------------------- .../iam/admin/services/core/impl/TenantManagementKeycloakImpl.java | 2 +- .../profile/iam/admin/services/core/tests/SetupNewGateway.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/63a797b7/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/63a797b7/airavata-services/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java ---------------------------------------------------------------------- diff --cc airavata-services/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java index 3741b39,85578a8..024dc94 --- a/airavata-services/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java +++ b/airavata-services/profile-service/iam-admin-services-core/src/test/java/org/apache/airavata/service/profile/iam/admin/services/core/tests/SetupNewGateway.java @@@ -17,7 -17,7 +17,6 @@@ public class SetupNewGateway private final static Logger logger = LoggerFactory.getLogger(SetupNewGateway.class); public static void main(String[] args) { - - UserRegistration(); } public static void setUpGateway(){
