Skip to content

Commit 718a9d7

Browse files
authored
Merge pull request #81 from AriaXLi/maint/relatime_linux
Revert "Merge pull request #79 from h0tw1r3/relatime"
2 parents e16b1c2 + 8bf995a commit 718a9d7

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

REFERENCE.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@ The refquota property. Valid values are `<size>`, `none`.
127127

128128
The refreservation property. Valid values are `<size>`, `none`.
129129

130-
##### `relatime`
131-
132-
The relatime property. Valid values are `on`, `off`. Only supported on Linux
133-
134130
##### `reservation`
135131

136132
The reservation property. Valid values are `<size>`, `none`.

lib/puppet/provider/zfs/zfs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def container_property
7878
[:aclinherit, :atime, :canmount, :checksum,
7979
:compression, :copies, :dedup, :defaultuserquota, :devices, :exec, :logbias,
8080
:mountpoint, :nbmand, :primarycache, :quota, :readonly,
81-
:recordsize, :refquota, :refreservation, :relatime, :reservation,
81+
:recordsize, :refquota, :refreservation, :reservation,
8282
:secondarycache, :setuid, :sharenfs, :sharesmb,
8383
:snapdir, :sync, :version, :volsize, :vscan, :xattr].each do |field|
8484
define_method(field) do

lib/puppet/type/zfs.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ module Puppet
112112
desc 'The refreservation property. Valid values are `<size>`, `none`.'
113113
end
114114

115-
newproperty(:relatime) do
116-
desc 'The relatime property. Valid values are `on`, `off`. Only supported on Linux'
117-
end
118-
119115
newproperty(:reservation) do
120116
desc 'The reservation property. Valid values are `<size>`, `none`.'
121117
end

0 commit comments

Comments
 (0)