public_git
/
freenas-proxmox
mirror of https://github.com/TheGrandWazoo/freenas-proxmox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of 

https://github.com/TheGrandWazoo/freenas-proxmox.git

Conflicts:
	perl5/PVE/Storage/ZFSPlugin.pm.patch
	stable-6/perl5/PVE/Storage/ZFSPlugin.pm.patch
This commit is contained in:
Kevin Scott Adams 2019-10-22 21:18:35 -04:00
parent 0e14d207ad c25fa0fe58
commit 826e1e7ad2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
perl5/PVE/Storage/ZFSPlugin.pm.patch
View File

@ -1,5 +1,10 @@
<<<<<<< HEAD
--- ZFSPlugin.pm.orig 2019-09-23 12:17:37.000000000 -0400 --- ZFSPlugin.pm.orig 2019-09-23 12:17:37.000000000 -0400
+++ ZFSPlugin.pm 2019-10-13 09:31:58.780554103 -0400 +++ ZFSPlugin.pm 2019-10-13 09:31:58.780554103 -0400
=======
--- ZFSPlugin.pm.orig 2019-09-03 04:24:37.000000000 -0400
+++ ZFSPlugin.pm 2019-09-22 13:54:51.570048336 -0400
>>>>>>> branch 'master' of https://github.com/TheGrandWazoo/freenas-proxmox.git
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
use base qw(PVE::Storage::ZFSPoolPlugin); use base qw(PVE::Storage::ZFSPoolPlugin);

5
stable-6/perl5/PVE/Storage/ZFSPlugin.pm.patch
View File

@ -1,5 +1,10 @@
<<<<<<< HEAD
--- ZFSPlugin.pm.orig 2019-09-23 12:17:37.000000000 -0400 --- ZFSPlugin.pm.orig 2019-09-23 12:17:37.000000000 -0400
+++ ZFSPlugin.pm 2019-10-13 09:31:58.780554103 -0400 +++ ZFSPlugin.pm 2019-10-13 09:31:58.780554103 -0400
=======
--- ZFSPlugin.pm.orig 2019-09-03 04:24:37.000000000 -0400
+++ ZFSPlugin.pm 2019-09-22 13:54:51.570048336 -0400
>>>>>>> branch 'master' of https://github.com/TheGrandWazoo/freenas-proxmox.git
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
use base qw(PVE::Storage::ZFSPoolPlugin); use base qw(PVE::Storage::ZFSPoolPlugin);