Skip to content

Commit 9886155

Browse files
committed
clashing -> colliding
1 parent 246f0c8 commit 9886155

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

crates/stackable-operator/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file.
77
### Fixed
88

99
- Fix the logback configuration for logback versions from 1.3.6/1.4.6 to 1.3.11/1.4.11 ([#874]).
10-
- BREAKING: Avoid clashing volumes and mounts by only adding volumes or mounts if they do not already exist. This makes functions such as `PodBuilder::add_volume` or `ContainerBuilder::add_volume_mount` as well as related ones fallible ([#871]).
10+
- BREAKING: Avoid colliding volumes and mounts by only adding volumes or mounts if they do not already exist. This makes functions such as `PodBuilder::add_volume` or `ContainerBuilder::add_volume_mount` as well as related ones fallible ([#871]).
1111

1212
### Changed
1313

crates/stackable-operator/src/builder/pod/container.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl ContainerBuilder {
214214
/// exists.
215215
///
216216
/// A colliding [`VolumeMount`] would have the same mountPath but a different content than
217-
/// another [`VolumeMount`]. An appropriate error is returned when such a clashing mount path is
217+
/// another [`VolumeMount`]. An appropriate error is returned when such a colliding mount path is
218218
/// encountered.
219219
///
220220
/// ### Note
@@ -251,7 +251,7 @@ impl ContainerBuilder {
251251
/// exists.
252252
///
253253
/// A colliding [`VolumeMount`] would have the same mountPath but a different content than
254-
/// another [`VolumeMount`]. An appropriate error is returned when such a clashing mount path is
254+
/// another [`VolumeMount`]. An appropriate error is returned when such a colliding mount path is
255255
/// encountered.
256256
///
257257
/// ### Note

crates/stackable-operator/src/builder/pod/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ impl PodBuilder {
281281
/// Adds a new [`Volume`] to the container while ensuring that no colliding [`Volume`] exists.
282282
///
283283
/// A colliding [`Volume`] would have the same name but a different content than another
284-
/// [`Volume`]. An appropriate error is returned when such a clashing volume name is
284+
/// [`Volume`]. An appropriate error is returned when such a colliding volume name is
285285
/// encountered.
286286
///
287287
/// ### Note

0 commit comments

Comments
 (0)