Commits · fc1b5ee67ab008c160b35f33c4fa144ed4cc902c · OSDU / OSDU Data Platform / System / Search

Nov 03, 2022
- GONRG-5890-Change-to-GC · fc1b5ee6
  Eldor Pulatov [EPAM/GCP] authored 2 years ago and Oleksandr Kosse (EPAM) committed 2 years ago
  
  fc1b5ee6
Oct 17, 2022
- Merge branch 'GONRG-5813-Search-Policy-Disable-Option' into 'master' · 7a49cef5
  Oleksandr Kosse (EPAM) authored 2 years ago
  
  [GONRG-5813] Disable policy by default See merge request !363
  7a49cef5
- [GONRG-5813] Disable policy by default · a6d6085d
  Danylo Vanin (EPAM) authored 2 years ago and Oleksandr Kosse (EPAM) committed 2 years ago
  
  a6d6085d
Oct 14, 2022
- Merge branch 'az/td-fix-azure-deploy' into 'master' · b801008f
  Thulasi Dass Subramanian authored 2 years ago
  
  Resolve ConflictingBeanDefinition for DependencyLogger Bean and Upgrade reactor-core version in azure pom.xml See merge request !357
  b801008f
- Resolve ConflictingBeanDefinition for DependencyLogger Bean and Upgrade... · 1032c2be
  Thulasi Dass Subramanian authored 2 years ago
  
  Resolve ConflictingBeanDefinition for DependencyLogger Bean and Upgrade reactor-core version in azure pom.xml
  1032c2be
Oct 13, 2022
- Merge branch 'aws-integration' into 'master' · 5a7fa431
  Marc Burnie [AWS] authored 2 years ago
  
  Enabling AWS Partition Policies on Search See merge request !360
  5a7fa431
- Merge branch 'master' into master-dev-merge · 37652ef9
  Marc Burnie [AWS] authored 2 years ago
  
  37652ef9
- Enabling AWS Partition Policies on Search · e19913d1
  Marc Burnie [AWS] authored 2 years ago
  
  e19913d1
Oct 12, 2022
- Merge branch 'dependency-upgrade' into 'master' · eb8af4eb
  David Diederich authored 2 years ago
  
  Upgrade First Party Library Dependencies for Release 0.17 See merge request !343
  eb8af4eb
Oct 10, 2022
- Merge remote-tracking branch 'origin/master' into... · dc182638
  Yifei Xu authored 2 years ago
  
  Merge remote-tracking branch 'origin/master' into origin_master_origin_dev-merge-auto-generated_2022_10_10_16_26_50
  dc182638
- Merge branch 'merge-ibm-helm' into 'master' · ff7601be
  Anuj Gupta authored 2 years ago
  
  Update devops/ibm/ibm-search-service-config/values.yaml,... See merge request !348
  ff7601be
- Update devops/ibm/ibm-search-service-config/values.yaml,... · b623ebff
  Manish Singh authored 2 years ago and Anuj Gupta committed 2 years ago
  
  b623ebff
Oct 07, 2022
- Merge remote-tracking branch 'origin/master' into... · ad470614
  Yifei Xu authored 2 years ago
  
  Merge remote-tracking branch 'origin/master' into origin_master_origin_dev-merge-auto-generated_2022_10_07_09_40_24
  ad470614
- Merge branch 'gcp-readme-policy' into 'master' · 8071a8f9
  Riabokon Stanislav(EPAM)[GCP] authored 2 years ago
  
  Update README.md See merge request !351
  8071a8f9
- Update README.md · 68e588ce
  Riabokon Stanislav(EPAM)[GCP] authored 2 years ago
  
  68e588ce
- Merge branch 'revert-18714b84 ' into 'master' · 0a13378f
  Riabokon Stanislav(EPAM)[GCP] authored 2 years ago
  
  Revert "Merge branch 'Stanislav_Riabokon-master-patch-15679' into 'master'" See merge request !350
  0a13378f
- Revert "Merge branch 'Stanislav_Riabokon-master-patch-15679' into 'master'" · a8769059
  Riabokon Stanislav(EPAM)[GCP] authored 2 years ago
  
  a8769059
- Merge branch 'Stanislav_Riabokon-master-patch-15679' into 'master' · 18714b84
  Riabokon Stanislav(EPAM)[GCP] authored 2 years ago
  
  Update README.md See merge request !349
  18714b84
- Update README.md · 1c60a393
  Riabokon Stanislav(EPAM)[GCP] authored 2 years ago
  
  1c60a393
- Merge remote-tracking branch 'origin/master' into dependency-upgrade · 1367e42a
  David Diederich authored 2 years ago
  
  Conflicts: pom.xml
  1367e42a
Oct 06, 2022
- Merge branch 'kamalika/masterPod' into 'master' · 5864cd63
  Kamalika Saha authored 2 years ago
  
  Bug: 11682 : upgrade-dependencies See merge request !340
  5864cd63
Oct 05, 2022
- Merge branch 'DavidMeng-UpgradeGson' into 'master' · 481adc9c
  Xiangliang Meng authored 2 years ago
  
  Upgrade Gson See merge request !341
  481adc9c
- Upgrade Gson · 6217ec8e
  Xiangliang Meng authored 2 years ago
  
  6217ec8e
- Merge branch 'DavidMeng-UpgradeTomcat' into 'master' · 61b59a91
  Xiangliang Meng authored 2 years ago
  
  Upgrade Tomcat See merge request !345
  61b59a91
- Upgrade Tomcat · c77b9c33
  Xiangliang Meng authored 2 years ago
  
  c77b9c33
Oct 03, 2022

Squashed commit of the following · 6e30a60f

Xiangliang Meng authored 2 years ago

commit 11e80425 
Author: AWSReservedSSO_OSDU-Power-User_7d859056df6b352b/xlmeng <AWSReservedSSO_OSDU-Power-User_7d859056df6b352b/xlmeng> 
Date: Mon Oct 03 2022 14:11:09 GMT-0400 (Eastern Daylight Time) 

    Conflicts resolved in the console.

commit c3dd1599 
Author: David Meng <xlmeng@amazon.com> 
Date: Wed Sep 28 2022 15:47:34 GMT-0400 (Eastern Daylight Time) 

    Upgrade Tomcat

6e30a60f

Merge branch 'master' into master-dev-merge · df8972e5
Marc Burnie [AWS] authored 2 years ago

df8972e5
Updating NOTICE · 1e2c5fc9
David Diederich authored 2 years ago

1e2c5fc9
Merge remote-tracking branch 'origin/master' into dependency-upgrade · 0778e030
David Diederich authored 2 years ago
```
Conflicts:
	provider/search-azure/pom.xml
```
0778e030

Oct 02, 2022
- Update version of default branch to 0.18.0-SNAPSHOT · 13f355f0
  David Diederich authored 2 years ago
  
  [ci skip]
  13f355f0
- Merge branch 'update-notice' into 'master' · ee92370c
  David Diederich authored 2 years ago
  
  Update FOSSA NOTICE See merge request !344
  ee92370c
- Updating NOTICE · 195efa2c
  David Diederich authored 2 years ago
  
  195efa2c
- Upgrade First Party Library Dependencies for Release 0.17 · a70dee83
  David Diederich authored 2 years ago
  
  a70dee83
Oct 01, 2022
- Merge branch 'aws-cicd' into 'master' · 92eba8ec
  Marc Burnie [AWS] authored 2 years ago
  
  AWS Using Helm to Deploy See merge request !342
  92eba8ec
- AWS Using Helm to Deploy · 06611c8c
  Marc Burnie [AWS] authored 2 years ago
  
  06611c8c
Sep 30, 2022
- Merge branch 'master' into master-dev-merge-xlmeng · dcbe5136
  Xiangliang Meng authored 2 years ago
  
  dcbe5136
- Squashed commit of the following · 725cf79f
  Xiangliang Meng authored 2 years ago
  
  commit 7028fd32 Author: David Meng <xlmeng@amazon.com> Date: Tue Sep 27 2022 11:18:33 GMT-0400 (Eastern Daylight Time) Upgrade Gson
  725cf79f
- Merge branch 'feature/OPA_translation_integration' into 'master' · c273c5ef
  Marc Burnie [AWS] authored 2 years ago
  
  Added OPA Translation integration See merge request !290
  c273c5ef
- Added OPA Translation integration · 15be030e
  Maciej Hanszke authored 2 years ago and Marc Burnie [AWS] committed 2 years ago
  
  15be030e
- dependency upgrade · ea211a84
  Kamalika Saha authored 2 years ago
  
  ea211a84