diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 16:14:15 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:56 +0100 |
| commit | d5047faedef254d01a21618224698c190bb67e5b (patch) | |
| tree | 42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/services/logging | |
| parent | f4a418761b481b15900c78b8086e7be58b0afe4e (diff) | |
| download | nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.gz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.bz2 nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.lz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.xz nixlib-d5047faedef254d01a21618224698c190bb67e5b.tar.zst nixlib-d5047faedef254d01a21618224698c190bb67e5b.zip | |
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or an apply function.
Diffstat (limited to 'nixos/modules/services/logging')
| -rw-r--r-- | nixos/modules/services/logging/logstash.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 2f0eea505267..79bdf4f7bbca 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -99,7 +99,7 @@ in mkHash functions, which take a string representation of a float and an attrset, respectively. ''; - merge = mergeConfigs; + apply = mergeConfigs; }; filterConfig = mkOption { @@ -109,7 +109,7 @@ in representing a logstash configuration's filter section. See inputConfig description for details. ''; - merge = mergeConfigs; + apply = mergeConfigs; }; outputConfig = mkOption { @@ -119,7 +119,7 @@ in representing a logstash configuration's output section. See inputConfig description for details. ''; - merge = mergeConfigs; + apply = mergeConfigs; }; }; }; |