hotfix: removed merge conflict artifact from glossary
parent
bf75f87904
commit
26f67b661c
|
@ -923,16 +923,10 @@ Related entries: [series](#series), [shard duration](#shard-duration),
|
||||||
|
|
||||||
### shard group
|
### shard group
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
Shard groups are logical containers for shards and contain all shards with data
|
|
||||||
for a specified interval known as the [shard group duration](#shard-group-duration).
|
|
||||||
Every bucket that contains data has at least one shard group.
|
|
||||||
=======
|
|
||||||
Shard groups are logical containers for shards organized by [bucket](#bucket).
|
Shard groups are logical containers for shards organized by [bucket](#bucket).
|
||||||
Every bucket with data has at least one shard group.
|
Every bucket with data has at least one shard group.
|
||||||
A shard group contains all shards with data for the time interval covered by the shard group.
|
A shard group contains all shards with data for the time interval covered by the shard group.
|
||||||
The interval spanned by each shard group is the [shard group duration](#shard-group-duration).
|
The interval spanned by each shard group is the [shard group duration](#shard-group-duration).
|
||||||
>>>>>>> cb4186ba2075d97882bc5974623adbdd1e88934a
|
|
||||||
|
|
||||||
For more information, see [Shards and shard groups (OSS)](/influxdb/%762.0/reference/internals/shards/).
|
For more information, see [Shards and shard groups (OSS)](/influxdb/%762.0/reference/internals/shards/).
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue