Skip to content

Commit

Permalink
Merge branch 'main' into chore/adding-go-memlimit
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolastakashi committed Mar 23, 2024
2 parents eab1db8 + deb615f commit fe1b2f7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
### Changed

- [#7123](https://github.com/thanos-io/thanos/pull/7123) Rule: Change default Alertmanager API version to v2.
- [##7222](https://github.com/thanos-io/thanos/pull/7123) Automatic detection of memory limits and configure GOMEMLIMIT to match.
- [#7222](https://github.com/thanos-io/thanos/pull/7123) Automatic detection of memory limits and configure GOMEMLIMIT to match.

### Removed

Expand Down
2 changes: 0 additions & 2 deletions docs/components/store.md
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,6 @@ While the remaining settings are **optional**:
The `redis` index cache allows to use [Redis](https://redis.io) as cache backend. This cache type is configured using `--index-cache.config-file` to reference the configuration file or `--index-cache.config` to put yaml config directly:

```yaml mdox-exec="go run scripts/cfggen/main.go --name=cacheutil.RedisClientConfig"
# command-line-arguments
ld: warning: ignoring duplicate libraries: '-lproc'
type: REDIS
config:
addr: ""
Expand Down

0 comments on commit fe1b2f7

Please sign in to comment.