prometheus

Commit Graph

Author	SHA1	Message	Date
Ganesh Vernekar	614d6c0c84	Update the VERSION file to say v2.39.0-rc.0 (#11364 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	2 years ago
Julius Volz	818d6e6088	Cut Prometheus v2.38.0 (#11161 ) Signed-off-by: Julius Volz <julius.volz@gmail.com> Signed-off-by: Julius Volz <julius.volz@gmail.com>	2 years ago
Julius Volz	d0b8c56480	Cut Prometheus v2.38.0-rc.0 (#11145 ) * Cut Prometheus v2.38.0-rc.0 Signed-off-by: Julius Volz <julius.volz@gmail.com> * Include new docs PRs in the changelog Signed-off-by: Julius Volz <julius.volz@gmail.com> * Add "Scrape:" prefix to changelog entry Co-authored-by: Levi Harrison <git@leviharrison.dev> Signed-off-by: Julius Volz <julius.volz@gmail.com> Signed-off-by: Julius Volz <julius.volz@gmail.com> Co-authored-by: Levi Harrison <git@leviharrison.dev>	2 years ago
Julien Pivotto	d0a3d44a45	Release 2.37.0 Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
Julien Pivotto	3599213e79	Release 2.37.0-rc.1 (#10999 ) Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
Julien Pivotto	335562dbfe	Cut v2.37.0-rc.0 (#10971 ) * Cut v2.37.0-rc.0 Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>	2 years ago
Matthias Loibl	ee9d85bd6c	Add v2.36.2 CHANGELOG and VERSION update Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>	2 years ago
Matthias Loibl	e5b794293f	Add v2.36.1 CHANGELOG and VERSION update Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>	3 years ago
Matthias Loibl	4dc148113e	Cut v2.36.0 Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>	3 years ago
Matthias Loibl	34820f5405	Update CHANGELOG for v2.36 Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>	3 years ago
Augustin Husson	6656cd29fe	cut v2.35.0 (#10614 ) * cut v2.35.0 Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * add a note about the changes introduced by go1.18 Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	3 years ago
Augustin Husson	5b80eaa3ca	cut v2.35.0-rc1 (#10596 ) * cut v2.35.0-rc1 Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	3 years ago
Augustin Husson	5b73e51826	cut v2.35.0-rc0 (#10543 ) Signed-off-by: Augustin Husson <husson.augustin@gmail.com>	3 years ago
Chris Marchbanks	5b3792ca69	Cut 2.34.0 Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	3 years ago
Chris Marchbanks	6c05a851ed	Cut 2.34.0-rc.2 Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	3 years ago
Chris Marchbanks	f620efee49	Cut 2.34.0-rc.1 Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	3 years ago
Chris Marchbanks	e25a599255	Cut 2.34.0-rc.0 (#10347 ) Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	3 years ago
Ganesh Vernekar	83032011a5	Cut v2.33.4 (#10337 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	3 years ago
Julien Pivotto	56e14463bc	Release 2.33.3 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Julien Pivotto	b4714db0a6	Release 2.33.2 (#10286 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
beorn7	7f57110fd0	Cut v2.33.1 Signed-off-by: beorn7 <beorn@grafana.com>	3 years ago
beorn7	ae8603ce34	Cut v2.33.0 Signed-off-by: beorn7 <beorn@grafana.com>	3 years ago
beorn7	e00eefa376	Cut v2.33.0-rc.1 Signed-off-by: beorn7 <beorn@grafana.com>	3 years ago
beorn7	c19e75f725	Cut v2.33-rc.0 Signed-off-by: beorn7 <beorn@grafana.com>	3 years ago
Julius Volz	bf6e6b444e	Cut v2.32.1 Signed-off-by: Julius Volz <julius.volz@gmail.com>	3 years ago
Julius Volz	89263292a9	Cut v2.32.0 Signed-off-by: Julius Volz <julius.volz@gmail.com>	3 years ago
Julius Volz	7040ae3db1	Cut v2.32.0-rc.1 Signed-off-by: Julius Volz <julius.volz@gmail.com>	3 years ago
Julius Volz	bfa200c7a7	Cut Prometheus 2.32.0-rc.0 (#9919 ) * Cut Prometheus 2.32.0-rc.0 Signed-off-by: Julius Volz <julius.volz@gmail.com> * Address review comments Signed-off-by: Julius Volz <julius.volz@gmail.com> * Address more review comments Signed-off-by: Julius Volz <julius.volz@gmail.com> * Remove some non-user-visible changelog items Signed-off-by: Julius Volz <julius.volz@gmail.com> * Remove one more non-user-visible change Signed-off-by: Julius Volz <julius.volz@gmail.com>	3 years ago
Julien Pivotto	c32725ba78	Release Prometheus 2.32.0-beta.0 (#9747 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Julien Pivotto	411021ada9	Release 2.31.1 (#9669 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Julien Pivotto	d4c83da6d2	Release 2.31 (#9639 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Julien Pivotto	25d06a9b76	Release 2.31.0-rc.1 (#9587 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Julien Pivotto	21834bca6b	Release 2.31.0-rc.0 (#9556 ) * Release 2.31.0-rc.0 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Ganesh Vernekar	f29caccc42	Cut v2.30.3 (#9446 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	3 years ago
Ganesh Vernekar	b30db03f35	Cut v2.30.2 (#9426 ) * Don't error on overlapping m-mapped chunks during WAL replay (#9381) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Reduce log level during WAL replay on overlapping m-map chunks (#9425) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> * Cut v2.30.2 Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	3 years ago
Ganesh Vernekar	fafb309d40	Cut v2.30.1 (#9402 ) * backfill: Do not align the start of the group since we align every rule. Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Backfill: Do not query after --end (#9340) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Redact remote write URL when used for metric label (#9383) Redact any basic auth passwords in the remote write URL (which are technically allowed although not recommended) when used as metric labels. Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com> * Azure: Fix panic when no computername is set (#9387) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Cut v2.30.1 Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com> Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: Nick Pillitteri <56quarters@users.noreply.github.com>	3 years ago
Ganesh Vernekar	37468d88dc	Cut v2.30.0 (#9329 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	3 years ago
Ganesh Vernekar	05a816bfb7	Cut v2.30.0-rc.0 (#9316 ) Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>	3 years ago
Frederic Branczyk	571629628e	*: Cut v2.29.2 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	3 years ago
Julien Pivotto	dcb07e8eac	Release 2.29.1 (#9193 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	3 years ago
Frederic Branczyk	92981dfe7e	*: cut v2.29.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	3 years ago
Frederic Branczyk	77d3f3722e	*: cut v2.29.0-rc.2 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	3 years ago
Frederic Branczyk	868776b4d0	*: Cut v2.29.0-rc.1 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	3 years ago
Frederic Branczyk	c9ae5f5ebf	VERSION: bump to 2.29.0-rc.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	3 years ago
Julius Volz	4a5aef0495	Merge release-2.28 back into main (#8975 ) * Cut v2.28.0-rc.0 (#8954) * Cut v2.28.0-rc.0 Signed-off-by: Julius Volz <julius.volz@gmail.com> * Changelog fixup Signed-off-by: Julius Volz <julius.volz@gmail.com> * Address review comments Signed-off-by: Julius Volz <julius.volz@gmail.com> * Downgrade some features to enhancements Signed-off-by: Julius Volz <julius.volz@gmail.com> * Adjust release date to today Signed-off-by: Julius Volz <julius.volz@gmail.com> * Migrate HTTP SD docs from docs repo (#8972) See discussion in https://github.com/prometheus/docs/pull/1975 Signed-off-by: Julius Volz <julius.volz@gmail.com> * Cut Prometheus v2.28.0 (#8973) Signed-off-by: Julius Volz <julius.volz@gmail.com>	4 years ago
Julius Volz	d98d342f2b	Cut v2.28.0-rc.0 (#8954 ) (#8963 ) * Cut v2.28.0-rc.0 Signed-off-by: Julius Volz <julius.volz@gmail.com> * Changelog fixup Signed-off-by: Julius Volz <julius.volz@gmail.com> * Address review comments Signed-off-by: Julius Volz <julius.volz@gmail.com> * Downgrade some features to enhancements Signed-off-by: Julius Volz <julius.volz@gmail.com> * Adjust release date to today Signed-off-by: Julius Volz <julius.volz@gmail.com>	4 years ago
Julien Pivotto	db7f0bcec2	Merge pull request from GHSA-vx57-7f4q-fpc7 * Do not remove /new because it is not part of the route parameter (CVE-2021-29622) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * Release 2.27.1 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Chris Marchbanks	24c9b61221	Release 2.27.0 (#8814 ) Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	4 years ago
Chris Marchbanks	aedd4fa95c	Cut v2.27.0-rc.0 (#8793 ) Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	4 years ago
Bartlomiej Plotka	f93b95d16e	Merge release-2.26.0 branch to main. (#8678 ) * Cut 2.26.0-rc.0 release. (#8640) * Cut 2.26.0-rc.0 Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Curate 2.26 changelog Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> * bump codemirror-promql to v0.14.0 (#8653) Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * fix: Wrap text in CodeMirror expression editor (#8665) Fixes https://github.com/prometheus/prometheus/issues/8663 Signed-off-by: Julius Volz <julius.volz@gmail.com> * Quick documentation of the exemplars feature on the disabled features (#8655) page. Signed-off-by: Callum Styan <callumstyan@gmail.com> * Cut 2.26.0 (#8676) * Cut 2.26.0-rc.1 Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Moved to full release. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: Augustin Husson <husson.augustin@gmail.com> Co-authored-by: Julius Volz <julius.volz@gmail.com> Co-authored-by: Callum Styan <callumstyan@gmail.com>	4 years ago
Julien Pivotto	f9692a6846	Release 2.25.2 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	d9c8a0504e	Release Prometheus 2.25.1 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	f3e7921595	Release 2.25.0 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	2a9e05b777	Release 2.25.0-rc.0 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
beorn7	e448727485	Cut v2.24.1 Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
beorn7	a6d4e8c636	Cut final v2.24.0 Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
beorn7	d9ab154fbe	More CHANGELOG tweaks Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
beorn7	e5ba7878ab	Cut v2.24.0-rc.0 Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
Ganesh Vernekar	26d89b4b07	Cut v2.23.0 (#8223 ) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	4 years ago
Ganesh Vernekar	9972e69c43	Cut v2.23.0-rc.0 (#8206 ) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	4 years ago
Frederic Branczyk	84b186b3fd	*: Cut v2.22.2 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	4 years ago
Frederic Branczyk	8e0e326f37	*: Cut v2.22.1 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	4 years ago
Frederic Branczyk	e1406c9406	*: Cut v2.22.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	4 years ago
Frederic Branczyk	be137435be	*: Cut v2.22.0-rc.0 Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>	4 years ago
Julien Pivotto	e83ef207b6	Release 2.21.0 (#7925 ) * Release 2.21.0 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	e55b0be9b7	Release 2.21.0-rc.1 (#7868 ) Add missing items in the changelog Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
Julien Pivotto	1195cc24e3	Release 2.21.0-rc.0 (#7857 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	4 years ago
beorn7	5aa1cdea60	Cut v2.20.1 Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
beorn7	c7013c0d4e	Cut final v2.20.0 Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
beorn7	9c9248aeb4	Cut 2.20.0-rc.1 Note that all new lines in the CHANGELOG except the last will disappear in the final release because they only deal with issues introduced in 2.20.0-rc.0. This commit also adds an explanation for the WAL compression becoming default. Furthermore, this commit reverts the upgrade to grpc 1.30.0. It was just a routine upgrade, but because grpc 1.30.0 contains two very Go-module unfriendly breaking changes that in combination wreak havoc for anyone importing from the prometheus/prometheus repo while still depending on 1.29.1, we decided to revert as Prometheus itself doesn't need the upgrade right now. Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
beorn7	68ac4418ef	Cut 2.20.0-rc.0 Signed-off-by: beorn7 <beorn@grafana.com>	4 years ago
Ganesh Vernekar	c448ada63d	Cut v2.19.2 (#7464 ) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	5 years ago
Ganesh Vernekar	eba3fdcbf0	Cut v2.19.1 (#7417 ) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	5 years ago
Ganesh Vernekar	5d7e3e9706	Cut v2.19.0 (#7366 ) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	5 years ago
Ganesh Vernekar	3d8e5b9d1a	Cut v2.19.0-rc.0 (#7341 ) Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>	5 years ago
Bartlomiej Plotka	ecee9c8abf	Cut v2.18.1 (#7222 ) Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Bartlomiej Plotka	a12e96299d	Cut 2.18.0 release. (#7201 ) Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Bartlomiej Plotka	b575f95c8a	Cut 2.18.0-rc.1 (#7186 ) Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Bartlomiej Plotka	33606d1cf7	Cut release 2.18.0-rc.0 (#7165 ) * Cut release 2.18.0-rc.0 Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Removed mention about Go update. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Julien comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Added Julien suggestion. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Brian's comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Chris' and Brian's comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com> * Addressed Bjorn's comments. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Julien Pivotto	18254838fb	Release 2.17.2 (#7139 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	ae041f97cf	Release 2.17.1 (#7055 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	39e01b369d	Release 2.17.0 (#7034 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	d47bdb9d12	Release 2.17.0-rc.4 (#7016 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	7920305e4e	release 2.17.0-rc.3 (#7006 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	7f86017126	Release 2.17.0-rc.2 (#7003 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	ccc511456a	Release 2.17.0-rc.1 (#6991 ) Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Julien Pivotto	bf0055536d	Release 2.17.0-rc.0 (#6966 ) * Release 2.17.0-rc.0 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	5 years ago
Callum Styan	b90be6f32a	Release 2.16.0 (#6817 ) Signed-off-by: Callum Styan <callumstyan@gmail.com>	5 years ago
Bartlomiej Plotka	f94faafbda	Cutting v2.16.0-rc.1 Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Callum Styan	22a04239c9	cut V2.16.0 rc.0 against the right branch (#6736 ) * Cut v2.16.0-rc.0 pre release Signed-off-by: Callum Styan <callumstyan@gmail.com>	5 years ago
Bartlomiej Plotka	801eaa22a5	Cut release 2.15.2 Cherry-picked 2 commits. Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Bartlomiej Plotka	54654340ad	Cut release 2.15.1 Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>	5 years ago
Bartlomiej Plotka	fa4658e4de	Pull release-2.15 branch to master. (#6510 ) * Cut 2.15.0-rc.0 release. (#6479) * Cut 2.15.0-rc.0 Signed-off-by: Bartek Plotka <bwplotka@gmail.com> * Cut 2.15.0 release. (#6509) Signed-off-by: Bartek Plotka <bwplotka@gmail.com>	5 years ago
Chris Marchbanks	edeb7a44cb	Cut 2.14.0 release (#6298 ) Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	5 years ago
Chris Marchbanks	c174a4516f	Cut the 2.14.0-rc.0 release (#6278 ) Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>	5 years ago
Krasi Georgiev	5b8ff9b8a4	Merge the 2.13 release branch (#6169 ) * Include tsdb tool in builds (#6085) (#6089) Add the tsdb tool to promu so that it's included in the release tarballs. Signed-off-by: Ben Kochie <superq@gmail.com> * web/ui: fix for CVE-2019-10215 (#6098) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * cut 2.13 release (#6099) Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com> * Fix panic in ARM builds of Prometheus (#6110) An extra sync.Pool was added during a refactor which caused some 64 bit, atomically accessed variables to no longer be 64 bit aligned. By moving all atomically accessed variables to the beginning of the struct they are guaranteed to be 64 bit aligned. Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com> * promql: fix potential panic in the query logger (#6094) Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Cut release 2.13.1 (#6145) Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>	5 years ago
Krasi Georgiev	81d284f806	Merge the 2.13 release branch to master (#6117 )	5 years ago
Krasi Georgiev	08c55c119f	cut 2.13.0-rc.0 pre-release (#6058 ) * cut 2.13.0-rc.0 pre-release Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>	5 years ago
Julius Volz	43acd0e2e9	Cut v2.12.0 (#5913 ) Signed-off-by: Julius Volz <julius.volz@gmail.com>	5 years ago
Julius Volz	5400ab4b87	Fix version (append -rc.0) in VERSION file (#5896 ) Signed-off-by: Julius Volz <julius.volz@gmail.com>	5 years ago

1 2 3 4 5 ...

258 Commits (296dd12ff448f972ae7297247798204aa278f4f8)