Skip to content

Commit

Permalink
Merge pull request #1158 from opentofu/fix_merge_conflicts
Browse files Browse the repository at this point in the history 
Fix merge conflicts
  • Loading branch information
@flavius-dinu
flavius-dinu committed Jan 29, 2024
2 parents 6dc43b5 + 77d4667 commit e75bdb7
Showing 1 changed file with 75 additions and 14 deletions.
89 changes: 75 additions & 14 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ <h3>Co-signed</h3>
<td><a href="https://b1-systems.de">B1 Systems GmbH</a></td>
<td>Company</td>
<td>Development; open-source community efforts</td>
</tr>
</tr>
<tr>
<td><a href="https://finisterra.io">Finisterra</a></td>
<td>Company</td>
Expand Down Expand Up @@ -1295,6 +1295,12 @@ <h3>Co-signed</h3>
<td>Company</td>
<td>Teaching; consulting services; open-source community efforts</td>
</tr>
<tr>
<td><a href="https://mydex.org">Mydex Data Services Community Interest Company</a></td>
<td>Company</td>
<td>Minor Development; Testing; open-source community efforts</td>
</tr>


<!-- Projects go below here -->

Expand Down Expand Up @@ -1382,6 +1388,11 @@ <h3>Co-signed</h3>

<!-- Individuals go below here -->

<tr>
<td><a href="https://www.linkedin.com/in/paulbecker/">Paul Becker</a></td>
<td>Individual</td>
<td>DevOps; Cloud; Helping organizations adopt modern IaC practices and principles</td>
</tr>
<tr>
<td><a href="https://connorfinnell.com">Connor Finnell</a></td>
<td>Individual</td>
Expand Down Expand Up @@ -2606,11 +2617,6 @@ <h3>Co-signed</h3>
<td>Individual</td>
<td>Development; Documentation; open-source community efforts</td>
</tr>
<tr>
<td><a href="https://github.com/adelinn">Adelin Niculae</a></td>
<td>Individual</td>
<td>DevOps; Cybersecurity</td>
</tr>
<tr>
<td><a href="https://github.com/camilosantana">Camilo Santana</a></td>
<td>Individual</td>
Expand Down Expand Up @@ -5072,7 +5078,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/Pablo-Oliveira">Pablo Oliveira</a></td>
<td>Individual</td>
<td>Documentation; Educating</td>
</tr>
</tr>
<tr>
<td><a href="https://www.linkedin.com/in/sakvarelidze/">Saba Sakvarelidze</a></td>
<td>Individual</td>
Expand All @@ -5082,7 +5088,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/gedalyahreback">Gedalyah Reback</a></td>
<td>Individual</td>
<td>Development; Open-Source Community Efforts, Documentation, Evangelism</td>
</tr>
</tr>
<tr>
<td><a href="https://github.com/johnnorton">John Norton</a></td>
<td>Individual</td>
Expand All @@ -5102,7 +5108,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/hkamran80">H. Kamran</a></td>
<td>Individual</td>
<td>Development; open-source community efforts</td>
</tr>
</tr>
<tr>
<td><a href="https://github.com/b1tsized">John Turner</a></td>
<td>Individual</td>
Expand All @@ -5118,6 +5124,11 @@ <h3>Co-signed</h3>
<td>Company</td>
<td>Education; Integration; Open-Source Community Efforts; Documentation</td>
</tr>
<tr>
<td><a href="https://aarnanetworks.com">Aarna Networks</a></td>
<td>Company</td>
<td>Development; open-source community efforts</td>
</tr>
<tr>
<td><a href="https://github.com/onbit-uchenik">Anubhav Vats</a></td>
<td>Individual</td>
Expand Down Expand Up @@ -5147,7 +5158,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/diogodias24">Diogo Dias</a></td>
<td>Individual</td>
<td>DevOps; Cloud Engineer; Infrastructure;</td>
</tr>
</tr>
<tr>
<td><a href="https://www.linkedin.com/in/rob-stolte/">Rob Stolte</a></td>
<td>Individual</td>
Expand Down Expand Up @@ -5187,7 +5198,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/https://github.com/223311">Bhabani Sankar</a></td>
<td>Individual</td>
<td>DevOps; IaC; Cloud Native; Security, Open-Source Community Efforts</td>
</tr>
</tr>
<tr>
<td><a href="https://www.cycloid.io">Cycloid - Sustainable Platform Engineering</a></td>
<td>Company</td>
Expand Down Expand Up @@ -5252,7 +5263,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/statusneo">StatusNeo</a></td>
<td>Company</td>
<td>Platform Engineering, SRE, DevOps; Open-Source Community Efforts, Documentation, Evangelism</td>
</tr>
</tr>
<tr>
<td><a href="https://github.com/pratikjain227">Pratik Jain</a></td>
<td>Individual</td>
Expand All @@ -5278,7 +5289,7 @@ <h3>Co-signed</h3>
<td>Individual</td>
<td>Infrastructure Engineering, DevOps</td>
</tr>

<tr>
<td><a href="https://github.com/emanuelschmoczer">Emanuel Schmoczer</a></td>
<td>Individual</td>
Expand All @@ -5288,7 +5299,7 @@ <h3>Co-signed</h3>
<td><a href="https://github.com/vkv">Sava Vukovic</a></td>
<td>Individual</td>
<td>DevOps; Platform Engineering; Development</td>
</tr>
</tr>
<tr>
<td><a href="https://github.com/PriyanshNegi">Priyansh Negi</a></td>
<td>Individual</td>
Expand Down Expand Up @@ -5319,6 +5330,56 @@ <h3>Co-signed</h3>
<td>Individual</td>
<td>DevSecOps; Cloud Solutions Architecture</td>
</tr>
<tr>
<td><a href="https://www.linkedin.com/in/robertmckenney/">Robert McKenney</a></td>
<td>Individual</td>
<td>Education; open-source community efforts</td>
</tr>
<tr>
<td><a href="https://www.linkedin.com/in/dgregor/">Dejan Gregor</a></td>
<td>Individual</td>
<td>DevOps; Development; Testing; Open Source Evangelism</td>
</tr>
<tr>
<td><a href="https://github.com/geronimo-iia">Jerome Guibert</a></td>
<td>Individual</td>
<td>Architect, SRE, Cloud Engineer, open-source community efforts</td>
</tr>
<tr>
<td><a href="https://github.com/hlange4">Hannes Lange</a></td>
<td>Individual</td>
<td>Customer Success Engineer, open source community efforts, Developer</td>
</tr>
<tr>
<td><a href="https://blogs.balachandran.org">Balachandran Sivakumar</a></td>
<td>Individual</td>
<td>Development; Testing; Open Source Evangelism</td>
</tr>
<tr>
<td><a href="www.linkedin.com/in/karpuzov">Rossen Karpuzov</a></td>
<td>Individual</td>
<td>Open-source community efforts; DevOps; System Administrator</td>
</tr>
<tr>
<td><a href="https://www.linkedin.com/in/frank-bernhardt/">Frank Bernhardt</a></td>
<td>Individual</td>
<td>Open-source and DevOps enthusiast</td>
</tr>
<tr>
<td><a href="https://github.com/wonderphil">Philip Davies</a></td>
<td>Individual</td>
<td>Platform Engineer; DevOps Architect; Cloud Architect; open-source community efforts</td>
</tr>
<tr>
<td><a href="https://www.linkedin.com/in/nathanjstephenson/">Nathan Stephenson</a></td>
<td>Individual</td>
<td>DevOps; Platform Engineering; Development</td>
</tr>
<tr>
<td><a href="https://github.com/rericsson/">Rob Ericsson</a></td>
<td>Individual</td>
<td>DevOps; open-source community efforts</td>
</tr>
</tbody>
</table>
</div>
Expand Down

0 comments on commit e75bdb7

Please sign in to comment.