520 commits

Author	SHA1	Message	Date
Alex Auvolat	ae2f32baf1	Hide deleted key in bucket info (fix #211)	2022-02-02 17:12:48 +01:00
Alex Auvolat	c99f55c420	Add restriction on part ordering in CompleteMultipartUpload	2022-01-25 12:45:00 +01:00
Alex Auvolat	acdf893362	Fix partnumber	2022-01-25 12:25:23 +01:00
Alex Auvolat	338b1b83ee	Implement part_number for GetObject	2022-01-24 21:04:42 +01:00
Alex Auvolat	6dab836f3a	Multipart improvements ... - support part_number for HeadObject - add checks in complete_multipart_upload	2022-01-24 21:04:40 +01:00
Alex Auvolat	513a6b15f9	Handle OPTIONS on website endpoint	2022-01-24 12:32:28 +01:00
Alex Auvolat	ea7fb901eb	Implement {Put,Get,Delete}BucketCors and CORS in general ... - OPTIONS request against API endpoint - Returning corresponding CORS headers on API calls - Returning corresponding CORS headers on website GET's	2022-01-24 11:58:00 +01:00
Trinity Pointard	820924534a	use clamp instead of min(max())	2022-01-24 11:56:59 +01:00
Quentin Dufour	440374524b	Implement ListParts	2022-01-21 10:42:30 +01:00
Quentin Dufour	fe003d6fbc	Add ListPartsResult structure	2022-01-20 16:38:55 +01:00
trinity-1686a	e55fa38c99	Add date verification to presigned urls (#196) ... fix #96 fix #162 by returning Forbidden instead Bad Request Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #196 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2022-01-18 12:22:31 +01:00
trinity-1686a	178e35f868	refactor s3_router and api_server to make unused Endpoint parameters more obvious	2022-01-17 15:50:24 +01:00
Jill	fdcddbe168	Fix Multipart Upload with WinSCP (#164) (#193) ... Closes #164. Reviewed-on: #193 Co-authored-by: Jill <kokakiwi@deuxfleurs.fr> Co-committed-by: Jill <kokakiwi@deuxfleurs.fr>	2022-01-17 11:18:40 +01:00
Jill	b45dcc1925	Support STREAMING-AWS4-HMAC-SHA256-PAYLOAD (#64) (#156) ... Closes #64. Reviewed-on: #156 Co-authored-by: Jill <kokakiwi@deuxfleurs.fr> Co-committed-by: Jill <kokakiwi@deuxfleurs.fr>	2022-01-17 10:55:31 +01:00
Alex Auvolat	d4dd2e2640	Make use of website config, return error document on error	2022-01-13 14:25:19 +01:00
Alex Auvolat	9eb211948e	Allow setting index document and error document on the CLI	2022-01-13 14:25:19 +01:00
Alex Auvolat	3ea8ca1b9e	Implement GetBucketWebsite	2022-01-13 14:23:52 +01:00
Alex Auvolat	f7349f4005	Add quotes in returned etags	2022-01-13 14:03:33 +01:00
Alex Auvolat	1ee8f596ee	Testing for UploadPartCopies and bugfixes in AWS signatures	2022-01-13 14:03:30 +01:00
Alex Auvolat	6617a72220	Implement UploadPartCopy	2022-01-13 13:58:47 +01:00
Alex Auvolat	3770a34e3d	Implement x-amz-copy-if-xxx copy preconditions and return more headers on copy (fix #187)	2022-01-13 13:56:55 +01:00
Quentin	b4592a00fe	Implement ListMultipartUploads (#171) ... Implement ListMultipartUploads, also refactor ListObjects and ListObjectsV2. It took me some times as I wanted to propose the following things: - Using an iterator instead of the loop+goto pattern. I find it easier to read and it should enable some optimizations. For example, when consuming keys of a common prefix, we do many [redundant checks](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/main/src/api/s3_list.rs#L125-L156) while the only thing to do is to [check if the following key is still part of the common prefix](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/feature/s3-multipart-compat/src/api/s3_list.rs#L476). - Try to name things (see ExtractionResult and RangeBegin enums) and to separate concerns (see ListQuery and Accumulator) - An IO closure to make unit tests possibles. - Unit tests, to track regressions and document how to interact with the code - Integration tests with `s3api`. In the future, I would like to move them in Rust with the aws rust SDK. Merging of the logic of ListMultipartUploads and ListObjects was not a goal but a consequence of the previous modifications. Some points that we might want to discuss: - ListObjectsV1, when using pagination and delimiters, has a weird behavior (it lists multiple times the same prefix) with `aws s3api` due to the fact that it can not use our optimization to skip the whole prefix. It is independant from my refactor and can be tested with the commented `s3api` tests in `test-smoke.sh`. It probably has the same weird behavior on the official AWS S3 implementation. - Considering ListMultipartUploads, I had to "abuse" upload id marker to support prefix skipping. I send an `upload-id-marker` with the hardcoded value `include` to emulate your "including" token. - Some ways to test ListMultipartUploads with existing software (my tests are limited to s3api for now). Co-authored-by: Quentin Dufour <quentin@deuxfleurs.fr> Reviewed-on: #171 Co-authored-by: Quentin <quentin@dufour.io> Co-committed-by: Quentin <quentin@dufour.io>	2022-01-12 19:04:55 +01:00
Alex Auvolat	3586c7257c	Clarify error message	2022-01-10 14:10:04 +01:00
Alex Auvolat	17ea28a438	Fix trivial bug in CLI	2022-01-10 12:38:33 +01:00
Alex Auvolat	7ee11f0eb6	Fix unit tests	2022-01-05 17:34:48 +01:00
Alex Auvolat	168a90dfb5	Fix some error codes	2022-01-05 17:07:36 +01:00
Alex Auvolat	fb1e31add0	Small CLI changes	2022-01-05 16:28:46 +01:00
Alex Auvolat	135858d067	Implement DeleteBucket	2022-01-05 16:28:19 +01:00
Alex Auvolat	8395030e48	Implement CreateBucket	2022-01-05 15:56:48 +01:00
Alex Auvolat	9431090b1e	Implement key allow|deny --create-bucket	2022-01-05 15:12:59 +01:00
Alex Auvolat	677ab60cc1	Small changes in key model and refactoring	2022-01-04 18:59:17 +01:00
Alex Auvolat	df35feba18	New buckets for 0.6.0: make bucket id a SK and not a HK, CLI updates	2022-01-04 12:53:14 +01:00
Alex Auvolat	1bcd6fabbd	New buckets for 0.6.0: small changes ... - Fix bucket delete - fix merge of bucket creation date - Replace deletable with option in aliases Rationale: if two aliases point to conflicting bucket, resolving by making an arbitrary choice risks making data accessible when it shouldn't be. We'd rather resolve to deleting the alias until someone puts it back.	2022-01-04 12:52:47 +01:00
Alex Auvolat	ba7f268b99	Rename and change query filters	2022-01-04 12:52:46 +01:00
Alex Auvolat	e59c23a69d	Refactor logic for setting/unsetting aliases	2022-01-04 12:52:46 +01:00
Alex Auvolat	2140cd7205	Remove website redirects	2022-01-04 12:52:46 +01:00
Alex Auvolat	beeef4758e	Some movement of helper code and refactoring of error handling	2022-01-04 12:52:46 +01:00
Alex Auvolat	d8ab5bdc3e	New buckets for 0.6.0: fix model and migration	2022-01-04 12:47:28 +01:00
Alex Auvolat	c7d5c73244	Add must_use to some CRDT functions	2022-01-04 12:47:28 +01:00
Alex Auvolat	b76d0580a0	Fix forgotten flag	2022-01-04 12:47:28 +01:00
Alex Auvolat	87121dce9d	New buckets for 0.6.0: documentation and build files	2022-01-04 12:47:06 +01:00
Alex Auvolat	b1cfd16913	New buckets for 0.6.0: small fixes, including: ... - ensure bucket names are correct aws s3 names - when making aliases, ensure timestamps of links in both ways are the same - fix small remarks by trinity - don't have a separate website_access field	2022-01-04 12:46:41 +01:00
Alex Auvolat	5db600e231	More complete output to bucket info and key info	2022-01-04 12:46:41 +01:00
Alex Auvolat	4d30e62db4	New buckets for 0.6.0: migration code and build files	2022-01-04 12:46:13 +01:00
Alex Auvolat	0bbb6673e7	Model changes	2022-01-04 12:45:52 +01:00
Alex Auvolat	53f71b3a57	Implement bucket alias and bucket unalias	2022-01-04 12:45:51 +01:00
Alex Auvolat	5b1117e582	New model for buckets	2022-01-04 12:45:46 +01:00
Alex Auvolat	8f6026de5e	Make table name a const in trait	2021-12-15 15:39:10 +01:00
trinity-1686a	ca7b438f3f	less strict ListBuckets (#178) ... fix #175 Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #178 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2021-12-15 15:05:36 +01:00
trinity-1686a	1eb972b1ac	Add compression using zstd (#173) ... fix #27 Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #173 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2021-12-15 11:26:43 +01:00
trinity-1686a	60d4459926	BucketWebsite (#174) ... fix #77 this does not store anything but a on/off switch for website, and does not implement GetBucketWebsite as it would require storing more. GetBucketWebsite should be pretty easy to implement once data is stored though. Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #174 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2021-12-15 10:41:39 +01:00
trinity-1686a	c4ac8835d3	add proper request router for s3 api (#163) ... fix #161 Current request router was organically grown, and is getting messier and messier with each addition. This router cover exaustively existing API endpoints (with exceptions listed in [#161(comment)](#161 (comment)) either because new and old api endpoint can't feasabily be differentied, or it's more lambda than s3). Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #163 Reviewed-by: Alex <alex@adnab.me> Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2021-12-06 15:17:47 +01:00
trinity-1686a	7f26ed55cd	Improved handling of HTTP ranges ... - correct HTTP code when range syntax is invalid (fix #140) - when multiple ranges are given, simply ignore and send whole file Co-authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #157 Reviewed-by: Alex <alex@adnab.me> Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2021-11-29 11:52:42 +01:00
Quentin Dufour	8811bb08e6	In ListBuckets, hide entry if no perms	2021-11-22 12:10:28 +01:00
Alex Auvolat	c94406f428	Improve how node roles are assigned in Garage ... - change the terminology: the network configuration becomes the role table, the configuration of a nodes becomes a node's role - the modification of the role table takes place in two steps: first, changes are staged in a CRDT data structure. Then, once the user is happy with the changes, they can commit them all at once (or revert them). - update documentation - fix tests - implement smarter partition assignation algorithm This patch breaks the format of the network configuration: when migrating, the cluster will be in a state where no roles are assigned. All roles must be re-assigned and commited at once. This migration should not pose an issue.	2021-11-16 16:05:53 +01:00
Trinity Pointard	53888995bd	update doc and comments	2021-11-16 15:41:41 +01:00
Trinity Pointard	396fe4c702	clippy	2021-11-16 15:41:41 +01:00
Trinity Pointard	02158ee666	fix issue where list on vhost-bucket would list bucket instead of bucket content	2021-11-16 15:41:41 +01:00
Trinity Pointard	9c58ec28d3	add support for vhost-style s3 bucket	2021-11-16 15:41:41 +01:00
Alex Auvolat	ad7ab31411	Implement GC delay for table data	2021-11-08 15:47:47 +01:00
Alex Auvolat	74a7a550eb	Safety: never voluntarily delete block in 10min interval after RC reaches zero	2021-11-08 15:47:47 +01:00
Alex Auvolat	cc255d46cd	Refactor and comment table GC logic	2021-11-08 15:47:44 +01:00
Trinity Pointard	9d7535c3f5	allow missing bootstrap_peers in garage.toml	2021-11-05 16:36:25 +01:00
Alex Auvolat	e8811f7c9d	Request strategy: don't launch all 3 requests if not needed	2021-11-04 16:19:27 +01:00
Alex Auvolat	2090a6187f	Add tranquilizer mechanism to improve on token bucket mechanism	2021-11-04 13:26:59 +01:00
Alex Auvolat	6f13d083ab	Add semaphore to limit RAM used by buffered outgoing requests	2021-11-03 18:02:57 +01:00
Alex Auvolat	8c4f418fe8	Fix peer list persistence: do not forget previous peers	2021-11-03 17:34:44 +01:00
Jill	bef6d627b0	Add environment variables equivalents for some CLI options.	2021-11-03 16:00:57 +01:00
Alex Auvolat	69b89fb46d	Fix race in block resync	2021-10-27 12:01:12 +02:00
Alex Auvolat	6b47c294f5	Refactoring on repair commands	2021-10-27 11:14:55 +02:00
Trinity Pointard	28c015d9ff	add cli parameter to verify local bloc integrity ... reuse code for listing local blocks add disk i/o speed limit on integrity check	2021-10-27 10:31:03 +02:00
Alex Auvolat	3e7f766d95	CLI: default rpc_host	2021-10-26 11:36:30 +02:00
Alex Auvolat	43e13a501d	Use published netapp crate instead of git repo	2021-10-26 10:36:57 +02:00
Alex Auvolat	ada7899b24	Fix clippy lints (fix #121)	2021-10-26 10:20:05 +02:00
Alex Auvolat	df8a4068d9	Refactor block manager code, and hopefully fix deadlock	2021-10-25 14:21:51 +02:00
Alex Auvolat	de4276202a	Improve CLI, adapt tests, update documentation	2021-10-25 14:21:48 +02:00
Alex Auvolat	1b450c4b49	Improvements to CLI and various fixes for netapp version ... Discovery via consul, persist peer list to file	2021-10-22 16:55:24 +02:00
Alex Auvolat	4067797d01	First port of Garage to Netapp	2021-10-22 15:55:18 +02:00
Quentin Dufour	dc017a0cab	Build Garage with Nix	2021-10-19 16:56:07 +02:00
Alex Auvolat	1acf7e4c66	Fix git_version!() when not in git repo (fix #100)	2021-10-11 14:26:54 +02:00
Alex Auvolat	f6060b92aa	Fix HTTP return code for DeleteObject (fix #98)	2021-10-11 14:24:49 +02:00
Alex Auvolat	f3a097abdf	WIP: try to fix #93, and improve S3 ListObjects (v1 and v2) API calls	2021-10-11 11:15:47 +02:00
Alex Auvolat	fa394dcd27	Support pkcs8 private keys (allowing for ed25519 to be used for rpc)	2021-07-06 11:16:01 +02:00
trinity-1686a	30a7dee920	exit when inconsistent level of replication is detected (#92) ... fix #88 Authored-by: Trinity Pointard <trinity.pointard@gmail.com> Reviewed-on: #92 Co-authored-by: trinity-1686a <trinity.pointard@gmail.com> Co-committed-by: trinity-1686a <trinity.pointard@gmail.com>	2021-06-02 13:30:39 +02:00
Trinity Pointard	b568765c75	try parsing rpc-host command-line parameter	2021-06-01 23:53:58 +02:00
Trinity Pointard	e9c265e9dc	format garage status output better	2021-06-01 19:12:27 +02:00
Trinity Pointard	289521886b	make most changes suggested during install-party	2021-05-29 21:37:49 +02:00
Alex Auvolat	b9127dd6f8	Prepare for v0.3.0 and add migration path from v0.2.1.x	2021-05-28 15:29:58 +02:00
Alex Auvolat	ddb2b29bfd	Rename datacenters into zones (doc not yet updated)	2021-05-28 14:07:36 +02:00
Alex Auvolat	b490ebc7f6	Many improvements on ring/replication and its configuration: ... - Explicit "replication_mode" configuration parameters that takes either "none", "2" or "3" as values, instead of letting user configure replication factor themselves. These are presets whose corresponding replication/quorum values can be found in replication/mode.rs - Explicit support for single-node and two-node deployments (number of nodes must be at least "replication_mode", with "none" we can have only one node) - Ring is now stored much more compactly with 256*8 + n*32 bytes, instead of 256*32 bytes - Support for gateway-only nodes that do not store data (these nodes still need a metadata_directory to store the list of bucket and keys since those are stored on all nodes; it also technically needs a data_directory to start but it will stay empty unless we have bugs)	2021-05-28 14:07:36 +02:00
Quentin Dufour	5fdabf3e75	Add basic support for the "Versioning" command	2021-05-14 22:33:26 +02:00
Alex Auvolat	6ccffc3162	Improved XML serialization ... - Use quick_xml and serde for all XML response returned by the S3 API. - Include tests for all structs used to generate XML - Remove old manual XML escaping function which was unsafe	2021-05-06 22:37:15 +02:00
Trinity Pointard	e4b9e4e24d	rename types to CamelCase	2021-05-03 22:15:09 +02:00
Trinity Pointard	6644df6b96	fix clippy warnings on garage	2021-05-03 22:11:42 +02:00
Trinity Pointard	f8ae8fc4be	fix clippy warnings on web	2021-05-03 22:11:42 +02:00
Trinity Pointard	84856e84e5	fix clippy warnings on api	2021-05-03 22:11:41 +02:00
Trinity Pointard	4a1e079e8f	fix clippy warnings on model	2021-05-03 22:11:41 +02:00
Trinity Pointard	f5a0cf0414	fix clippy warnings on table	2021-05-03 22:11:41 +02:00
Trinity Pointard	f05bb111c2	fix clippy warnings on util and rpc	2021-05-03 22:11:41 +02:00
Quentin Dufour	631c36b3ff	S3 API: support ListBuckets	2021-05-03 21:55:30 +02:00
Alex Auvolat	ee2a3d363b	Remove STREAMING-AWS4-HMAC-SHA256-PAYLOAD (see #64)	2021-05-03 17:30:40 +02:00
Alex Auvolat	575726358c	Tune Sled configuration ... - Make sled cache size and flush interval configurable - Set less agressive default values: - cache size 128MB instead of 1GB - Flush interval 2 seconds instead of .5 seconds	2021-05-03 17:27:43 +02:00
Alex Auvolat	dcfc32cf85	Many S3 compatibility improvements: ... - return XML errors - implement AuthorizationHeaderMalformed error to redirect clients to correct location (used by minio client) - implement GetBucketLocation - fix DeleteObjects XML parsing and response	2021-04-28 01:05:40 +02:00
Alex Auvolat	642186c530	Fix #59 (& issue)	2021-04-27 23:10:43 +02:00
Alex Auvolat	119217f9f6	change a few comments	2021-04-27 16:53:47 +02:00
Trinity Pointard	2812a027ea	change some more comments and revert changes on TableSchema	2021-04-27 16:49:07 +02:00
Trinity Pointard	74373aebcf	make most requested changes	2021-04-27 16:47:08 +02:00
Alex Auvolat	16300bbd89	remove useless comment	2021-04-27 16:44:01 +02:00
Trinity Pointard	5c4b2cec3c	document garage crate	2021-04-27 16:37:10 +02:00
Trinity Pointard	1e3df189d0	document api crate	2021-04-27 16:37:10 +02:00
Trinity Pointard	a2e1617d84	document web crate	2021-04-27 16:37:10 +02:00
Trinity Pointard	67585a4ffa	attempt at documenting model crate	2021-04-27 16:37:10 +02:00
Trinity Pointard	b437610812	attempt at documenting table crate	2021-04-27 16:37:10 +02:00
Trinity Pointard	f871689571	run cargo fmt on util and make missing doc warning	2021-04-27 16:37:10 +02:00
Trinity Pointard	8e0524ae15	document rpc crate	2021-04-27 16:37:10 +02:00
Trinity Pointard	f9bd2d8fb7	document util crate	2021-04-27 16:37:10 +02:00
Alex Auvolat	6b2b400292	small simplify	2021-04-27 16:37:09 +02:00
Alex Auvolat	8c33d565d6	Merge discovery loop with consul	2021-04-27 16:37:09 +02:00
Alex Auvolat	948e44a3f6	cargo fmt	2021-04-27 16:37:09 +02:00
Alex Auvolat	3e2e38c830	Print stats	2021-04-27 16:37:09 +02:00
Alex Auvolat	2e53e31cdd	Cargo fmt	2021-04-27 16:37:09 +02:00
Alex Auvolat	64b91c2645	Keep old data	2021-04-27 16:37:09 +02:00
Alex Auvolat	e16077f40a	Persist directly and not in background	2021-04-27 16:37:09 +02:00
Alex Auvolat	9ced9f78dc	Improve bootstraping: do it regularly; persist peer list	2021-04-27 16:37:08 +02:00
Alex Auvolat	f859d15062	update to v0.2.1	2021-03-19 13:39:18 +01:00
Alex Auvolat	fd8f4caa81	Support old CPUs	2021-03-19 12:19:40 +01:00
Alex Auvolat	4c26a0b9c1	Update Cargo.toml files with AGPL license info	2021-03-18 21:59:17 +01:00
Alex Auvolat	a1014224d3	garage node configure --replace <old_node_id> <new_node_id>	2021-03-18 21:49:12 +01:00
Trinity Pointard	f17cb6c969	resolve domain to multiple addresses ... And warn instead of failling when a domain can't be resolved	2021-03-18 21:04:30 +01:00
Trinity Pointard	c8a7ce5cdf	remove domain resolution for *_bind_addr	2021-03-18 19:47:51 +01:00
Trinity Pointard	81e9db783f	simplify addresse deserialialiser and limit allocations	2021-03-18 19:47:51 +01:00
Trinity Pointard	ae3b7029a9	add support for using domain name in configuration	2021-03-18 19:47:51 +01:00
Alex Auvolat	6edbc65847	Add trinity's comment in the code	2021-03-18 19:46:43 +01:00
Alex	bfa0ff8f82	Merge pull request 'add support for caching headers' (#49) from trinity-1686a/garage:cache-headers into master ... Reviewed-on: #49	2021-03-18 19:45:02 +01:00
Alex Auvolat	dead945c8f	Prepare for release 0.2	2021-03-18 19:33:15 +01:00
Alex Auvolat	4eb16e8863	Allow to import keys from previous Garage instance	2021-03-18 19:24:59 +01:00
Trinity Pointard	b4c903371c	add support for caching headers	2021-03-18 15:46:33 +01:00
Alex Auvolat	390ab02f41	Todo make a test for the Merkle updater	2021-03-16 20:13:07 +01:00
Alex Auvolat	7b10245dfb	Leader-based GC	2021-03-16 18:42:33 +01:00
Alex Auvolat	08bcd51956	GC object table in a specific case	2021-03-16 16:51:15 +01:00
Alex Auvolat	3fadc5cbbd	Small changes	2021-03-16 16:35:10 +01:00
Alex Auvolat	f4346cc5f4	Update dependencies	2021-03-16 15:58:40 +01:00
Alex Auvolat	2a41b82384	Simpler Merkle & sync	2021-03-16 12:18:03 +01:00
Alex Auvolat	0aad2f2e06	some reordering	2021-03-16 11:47:39 +01:00
Alex Auvolat	515029d026	Refactor code	2021-03-16 11:43:58 +01:00
Alex Auvolat	1d9961e411	Simplify replication logic	2021-03-16 11:14:27 +01:00
Alex Auvolat	6a8439fd13	Some improvements in background worker but we terminate late	2021-03-15 23:14:12 +01:00
Alex Auvolat	0cd5b2ae19	WIP migrate to tokio 1	2021-03-15 22:36:41 +01:00
Alex Auvolat	4d4117f2b4	Refactor block resync loop; make workers infaillible	2021-03-15 20:09:44 +01:00
Alex Auvolat	667e4e72a8	Small fixes	2021-03-15 19:51:16 +01:00