Skip to content

Commit eb8754e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into Broken-link-ebnkruma
2 parents 8c683f2 + 5f197ad commit eb8754e

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ The following providers offer FIDO2 security keys of different form factors that
112112
| Provider | Biometric | USB | NFC | BLE | FIPS Certified | Contact |
113113
|---------------------------|:-----------------:|:---:|:---:|:---:|:--------------:|-----------------------------------------------------------------------------------------------------|
114114
| AuthenTrend | ![y] | ![y]| ![y]| ![y]| ![n] | https://authentrend.com/about-us/#pg-35-3 |
115+
| Ciright | ![n] | ![n]| ![y]| ![n]| ![n] | https://www.cyberonecard.com/ |
115116
| Ensurity | ![y] | ![y]| ![n]| ![n]| ![n] | https://www.ensurity.com/contact |
116117
| Excelsecu | ![y] | ![y]| ![y]| ![y]| ![n] | https://www.excelsecu.com/productdetail/esecufido2secu.html |
117118
| Feitian | ![y] | ![y]| ![y]| ![y]| ![y] | https://shop.ftsafe.us/pages/microsoft |

articles/openshift/support-lifecycle.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ See the following guide for the [past Red Hat OpenShift Container Platform (upst
9797
|4.6|October 2020| February 2021|4.8 GA|
9898
|4.7|February 2021| July 15 2021|4.9 GA|
9999
|4.8|July 2021| Sept 15 2021|4.10 GA|
100+
|4.9|November 2021| February 1 2022|4.11 GA|
100101

101102
## FAQ
102103

0 commit comments

Comments
 (0)