forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #240 from truenas/NAS-129592-master
NAS-129592 / None / [truenas/zfs-2.3-release] Sync with the upstream master
- Loading branch information
Showing
200 changed files
with
5,524 additions
and
4,728 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,9 +88,11 @@ CONTRIBUTORS: | |
| Bassu <[email protected]> | ||
| Ben Allen <[email protected]> | ||
| Ben Cordero <[email protected]> | ||
| Benda Xu <[email protected]> | ||
| Benedikt Neuffer <[email protected]> | ||
| Benjamin Albrecht <[email protected]> | ||
| Benjamin Gentil <[email protected]> | ||
| Benjamin Sherman <[email protected]> | ||
| Ben McGough <[email protected]> | ||
| Ben Rubson <[email protected]> | ||
| Ben Wolsieffer <[email protected]> | ||
|
|
@@ -111,6 +113,7 @@ CONTRIBUTORS: | |
| bzzz77 <[email protected]> | ||
| cable2999 <[email protected]> | ||
| Caleb James DeLisle <[email protected]> | ||
| Cameron Harr <[email protected]> | ||
| Cao Xuewen <[email protected]> | ||
| Carlo Landmeter <[email protected]> | ||
| Carlos Alberto Lopez Perez <[email protected]> | ||
|
|
@@ -120,12 +123,15 @@ CONTRIBUTORS: | |
| Chen Can <[email protected]> | ||
| Chengfei Zhu <[email protected]> | ||
| Chen Haiquan <[email protected]> | ||
| ChenHao Lu <[email protected]> | ||
| Chip Parker <[email protected]> | ||
| Chris Burroughs <[email protected]> | ||
| Chris Davidson <[email protected]> | ||
| Chris Dunlap <[email protected]> | ||
| Chris Dunlop <[email protected]> | ||
| Chris Lindee <[email protected]> | ||
| Chris McDonough <[email protected]> | ||
| Chris Peredun <[email protected]> | ||
| Chris Siden <[email protected]> | ||
| Chris Siebenmann <[email protected]> | ||
| Christer Ekholm <[email protected]> | ||
|
|
@@ -144,6 +150,7 @@ CONTRIBUTORS: | |
| Clint Armstrong <[email protected]> | ||
| Coleman Kane <[email protected]> | ||
| Colin Ian King <[email protected]> | ||
| Colin Percival <[email protected]> | ||
| Colm Buckley <[email protected]> | ||
| Crag Wang <[email protected]> | ||
| Craig Loomis <[email protected]> | ||
|
|
@@ -156,6 +163,7 @@ CONTRIBUTORS: | |
| Damiano Albani <[email protected]> | ||
| Damian Szuberski <[email protected]> | ||
| Damian Wojsław <[email protected]> | ||
| Daniel Berlin <[email protected]> | ||
| Daniel Hiepler <[email protected]> | ||
| Daniel Hoffman <[email protected]> | ||
| Daniel Kobras <[email protected]> | ||
|
|
@@ -176,8 +184,10 @@ CONTRIBUTORS: | |
| David Quigley <[email protected]> | ||
| Debabrata Banerjee <[email protected]> | ||
| D. Ebdrup <[email protected]> | ||
| Dennis R. Friedrichsen <[email protected]> | ||
| Denys Rtveliashvili <[email protected]> | ||
| Derek Dai <[email protected]> | ||
| Dex Wood <[email protected]> | ||
| DHE <[email protected]> | ||
| Didier Roche <[email protected]> | ||
| Dimitri John Ledkov <[email protected]> | ||
|
|
@@ -235,9 +245,11 @@ CONTRIBUTORS: | |
| Gionatan Danti <[email protected]> | ||
| Giuseppe Di Natale <[email protected]> | ||
| Glenn Washburn <[email protected]> | ||
| gofaster <[email protected]> | ||
| Gordan Bobic <[email protected]> | ||
| Gordon Bergling <[email protected]> | ||
| Gordon Ross <[email protected]> | ||
| Gordon Tetlow <[email protected]> | ||
| Graham Christensen <[email protected]> | ||
| Graham Perrin <[email protected]> | ||
| Gregor Kopka <[email protected]> | ||
|
|
@@ -265,6 +277,7 @@ CONTRIBUTORS: | |
| Igor Kozhukhov <[email protected]> | ||
| Igor Lvovsky <[email protected]> | ||
| ilbsmart <[email protected]> | ||
| Ilkka Sovanto <[email protected]> | ||
| illiliti <[email protected]> | ||
| ilovezfs <[email protected]> | ||
| InsanePrawn <[email protected]> | ||
|
|
@@ -280,9 +293,11 @@ CONTRIBUTORS: | |
| Jan Engelhardt <[email protected]> | ||
| Jan Kryl <[email protected]> | ||
| Jan Sanislo <[email protected]> | ||
| Jaron Kent-Dobias <[email protected]> | ||
| Jason Cohen <[email protected]> | ||
| Jason Harmening <[email protected]> | ||
| Jason King <[email protected]> | ||
| Jason Lee <[email protected]> | ||
| Jason Zaman <[email protected]> | ||
| Javen Wu <[email protected]> | ||
| Jean-Baptiste Lallement <[email protected]> | ||
|
|
@@ -313,6 +328,7 @@ CONTRIBUTORS: | |
| Jonathon Fernyhough <[email protected]> | ||
| Jorgen Lundman <[email protected]> | ||
| Josef 'Jeff' Sipek <[email protected]> | ||
| Jose Luis Duran <[email protected]> | ||
| Josh Soref <[email protected]> | ||
| Joshua M. Clulow <[email protected]> | ||
| José Luis Salvador Rufo <[email protected]> | ||
|
|
@@ -336,8 +352,10 @@ CONTRIBUTORS: | |
| Kash Pande <[email protected]> | ||
| Kay Pedersen <[email protected]> | ||
| Keith M Wesolowski <[email protected]> | ||
| Kent Ross <[email protected]> | ||
| KernelOfTruth <[email protected]> | ||
| Kevin Bowling <[email protected]> | ||
| Kevin Greene <[email protected]> | ||
| Kevin Jin <[email protected]> | ||
| Kevin P. Fleming <[email protected]> | ||
| Kevin Tanguy <[email protected]> | ||
|
|
@@ -389,6 +407,7 @@ CONTRIBUTORS: | |
| Mark Shellenbaum <[email protected]> | ||
| marku89 <[email protected]> | ||
| Mark Wright <[email protected]> | ||
| Mart Frauenlob <[email protected]> | ||
| Martin Matuska <[email protected]> | ||
| Martin Rüegg <[email protected]> | ||
| Massimo Maggi <[email protected]> | ||
|
|
@@ -405,6 +424,7 @@ CONTRIBUTORS: | |
| Matus Kral <[email protected]> | ||
| Mauricio Faria de Oliveira <[email protected]> | ||
| Max Grossman <[email protected]> | ||
| Maxim Filimonov <[email protected]> | ||
| Maximilian Mehnert <[email protected]> | ||
| Max Zettlmeißl <[email protected]> | ||
| Md Islam <[email protected]> | ||
|
|
@@ -417,6 +437,7 @@ CONTRIBUTORS: | |
| Michael Niewöhner <[email protected]> | ||
| Michael Zhivich <[email protected]> | ||
| Michal Vasilek <[email protected]> | ||
| MigeljanImeri <[email protected]> | ||
| Mike Gerdts <[email protected]> | ||
| Mike Harsch <[email protected]> | ||
| Mike Leddy <[email protected]> | ||
|
|
@@ -448,6 +469,7 @@ CONTRIBUTORS: | |
| Olaf Faaland <[email protected]> | ||
| Oleg Drokin <[email protected]> | ||
| Oleg Stepura <[email protected]> | ||
| Olivier Certner <[email protected]> | ||
| Olivier Mazouffre <[email protected]> | ||
| omni <[email protected]> | ||
| Orivej Desh <[email protected]> | ||
|
|
@@ -479,6 +501,7 @@ CONTRIBUTORS: | |
| Prasad Joshi <[email protected]> | ||
| privb0x23 <[email protected]> | ||
| P.SCH <[email protected]> | ||
| Quartz <[email protected]> | ||
| Quentin Zdanis <[email protected]> | ||
| Rafael Kitover <[email protected]> | ||
| RageLtMan <[email protected]> | ||
|
|
@@ -491,11 +514,15 @@ CONTRIBUTORS: | |
| Riccardo Schirone <[email protected]> | ||
| Richard Allen <[email protected]> | ||
| Richard Elling <[email protected]> | ||
| Richard Kojedzinszky <[email protected]> | ||
| Richard Laager <[email protected]> | ||
| Richard Lowe <[email protected]> | ||
| Richard Sharpe <[email protected]> | ||
| Richard Yao <[email protected]> | ||
| Rich Ercolani <[email protected]> | ||
| Rick Macklem <[email protected]> | ||
| rilysh <[email protected]> | ||
| Robert Evans <[email protected]> | ||
| Robert Novak <[email protected]> | ||
| Roberto Ricci <[email protected]> | ||
| Rob Norris <[email protected]> | ||
|
|
@@ -509,7 +536,9 @@ CONTRIBUTORS: | |
| Ryan Lahfa <[email protected]> | ||
| Ryan Libby <[email protected]> | ||
| Ryan Moeller <[email protected]> | ||
| Sam Atkinson <[email protected]> | ||
| Sam Hathaway <[email protected]> | ||
| Sam James <[email protected]> | ||
| Sam Lunt <[email protected]> | ||
| Samuel VERSCHELDE <[email protected]> | ||
| Samuel Wycliffe <[email protected]> | ||
|
|
@@ -530,13 +559,16 @@ CONTRIBUTORS: | |
| Shaan Nobee <[email protected]> | ||
| Shampavman <[email protected]> | ||
| Shaun Tancheff <[email protected]> | ||
| Shawn Bayern <[email protected]> | ||
| Shengqi Chen <[email protected]> | ||
| Shen Yan <[email protected]> | ||
| Simon Guest <[email protected]> | ||
| Simon Klinkert <[email protected]> | ||
| Sowrabha Gopal <[email protected]> | ||
| Spencer Kinny <[email protected]> | ||
| Srikanth N S <[email protected]> | ||
| Stanislav Seletskiy <[email protected]> | ||
| Stefan Lendl <[email protected]> | ||
| Steffen Müthing <[email protected]> | ||
| Stephen Blinick <[email protected]> | ||
| sterlingjensen <[email protected]> | ||
|
|
@@ -557,6 +589,7 @@ CONTRIBUTORS: | |
| Teodor Spæren <[email protected]> | ||
| TerraTech <[email protected]> | ||
| Thijs Cramer <[email protected]> | ||
| Thomas Bertschinger <[email protected]> | ||
| Thomas Geppert <[email protected]> | ||
| Thomas Lamprecht <[email protected]> | ||
| Till Maas <[email protected]> | ||
|
|
@@ -586,6 +619,7 @@ CONTRIBUTORS: | |
| Turbo Fredriksson <[email protected]> | ||
| Tyler J. Stachecki <[email protected]> | ||
| Umer Saleem <[email protected]> | ||
| Vaibhav Bhanawat <[email protected]> | ||
| Valmiky Arquissandas <[email protected]> | ||
| Val Packett <[email protected]> | ||
| Vince van Oosten <[email protected]> | ||
|
|
@@ -614,6 +648,7 @@ CONTRIBUTORS: | |
| yuina822 <[email protected]> | ||
| YunQiang Su <[email protected]> | ||
| Yuri Pankov <[email protected]> | ||
| Yuxin Wang <[email protected]> | ||
| Yuxuan Shui <[email protected]> | ||
| Zachary Bedell <[email protected]> | ||
| Zach Dykstra <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.