1. 25 Feb, 2021 1 commit
  2. 20 Feb, 2021 1 commit
  3. 19 Feb, 2021 1 commit
  4. 17 Feb, 2021 3 commits
  5. 09 Feb, 2021 2 commits
  6. 08 Feb, 2021 5 commits
  7. 03 Feb, 2021 2 commits
  8. 01 Feb, 2021 5 commits
  9. 29 Jan, 2021 2 commits
  10. 23 Jan, 2021 1 commit
  11. 21 Jan, 2021 1 commit
  12. 14 Jan, 2021 4 commits
  13. 13 Jan, 2021 1 commit
  14. 11 Jan, 2021 4 commits
    • Riabokon Stanislav(EPAM)[GCP]'s avatar
      Merge branch... · 9d23d8b7
      Riabokon Stanislav(EPAM)[GCP] authored
      Merge branch 'feature/GONRG-1424_-_R3_Entitlements_SQL_an_endpoint_List_all_users_' into 'integration-master'
      
      GONRG-1424: R3 Entitlements SQL an endpoint "List all users"
      
      Closes GONRG-1424
      
      See merge request go3-nrg/platform/security-and-compliance/os-entitlements-java!46
      9d23d8b7
    • Artem Dobrynin (EPAM)'s avatar
      Merge branch 'integration-master' into... · 2e2ea329
      Artem Dobrynin (EPAM) authored
      Merge branch 'integration-master' into feature/GONRG-1424_-_R3_Entitlements_SQL_an_endpoint_List_all_users_
      2e2ea329
    • Artem Dobrynin (EPAM)'s avatar
      Merge remote-tracking branch 'origin/integration-master' into integration-master · 02cb3f0f
      Artem Dobrynin (EPAM) authored
      # Conflicts:
      #	README.md
      #	entitlements-core/src/main/java/org/opengroup/osdu/java/entitlements/api/EntitlementsApi.java
      #	entitlements-core/src/main/java/org/opengroup/osdu/java/entitlements/service/EntitlementsService.java
      #	entitlements-core/src/main/java/org/opengroup/osdu/java/entitlements/service/GroupsRepository.java
      #	provider/entitlements-gcp-jdbc/src/main/java/org/opengroup/osdu/java/entitlements/jdbc/service/JdbcEntitlementsServiceImpl.java
      #	provider/entitlements-gcp-jdbc/src/main/java/org/opengroup/osdu/java/entitlements/jdbc/service/JdbcGroupsRepository.java
      #	provider/entitlements-gcp-jdbc/src/test/java/org/opengroup/osdu/java/entitlements/jdbc/service/JdbcEntitlementsServiceImplTest.java
      #	provider/entitlements-gcp/src/main/java/org/opengroup/osdu/java/gcp/entitlements/service/GSuiteGroupsRepository.java
      #	provider/entitlements-gcp/src/main/java/org/opengroup/osdu/java/gcp/entitlements/service/GsuiteEntitlementsServiceImpl.java
      #	provider/entitlements-reference/src/main/java/org/opengroup/osdu/java/entitlements/reference/service/GroupsRepositoryMongo.java
      #	provider/entitlements-reference/src/main/java/org/opengroup/osdu/java/entitlements/reference/service/MongoEntitlementsServiceImpl.java
      02cb3f0f
    • Artem Dobrynin (EPAM)'s avatar
      Merge branch 'integration-master' into... · d18e806e
      Artem Dobrynin (EPAM) authored
      Merge branch 'integration-master' into 'feature/GONRG-1424_-_R3_Entitlements_SQL_an_endpoint_List_all_users_'
      
      # Conflicts:
      #   README.md
      #   entitlements-core/src/main/java/org/opengroup/osdu/java/entitlements/api/EntitlementsApi.java
      #   entitlements-core/src/main/java/org/opengroup/osdu/java/entitlements/service/EntitlementsService.java
      #   entitlements-core/src/main/java/org/opengroup/osdu/java/entitlements/service/GroupsRepository.java
      #   provider/entitlements-gcp-jdbc/src/main/java/org/opengroup/osdu/java/entitlements/jdbc/service/JdbcEntitlementsServiceImpl.java
      #   provider/entitlements-gcp-jdbc/src/main/java/org/opengroup/osdu/java/entitlements/jdbc/service/JdbcGroupsRepository.java
      #   provider/entitlements-gcp-jdbc/src/test/java/org/opengroup/osdu/java/entitlements/jdbc/service/JdbcEntitlementsServiceImplTest.java
      #   provider/entitlements-gcp/src/main/java/org/opengroup/osdu/java/gcp/entitlements/service/GSuiteGroupsRepository.java
      #   provider/entitlements-gcp/src/main/java/org/opengroup/osdu/java/gcp/entitlements/service/GsuiteEntitlementsServiceImpl.java
      #   provider/entitlements-reference/src/main/java/org/opengroup/osdu/java/entitlements/reference/service/GroupsRepositoryMongo.java
      #   provider/entitlements-reference/src/main/java/org/opengroup/osdu/java/entitlements/reference/service/MongoEntitlementsServiceImpl.java
      d18e806e
  15. 02 Jan, 2021 2 commits
  16. 31 Dec, 2020 2 commits
  17. 30 Dec, 2020 3 commits