Skip to content

Commit 9111994

Browse files
authored
Merge branch 'trunk' into patch-1
2 parents 41ab4b5 + 973f891 commit 9111994

File tree

11 files changed

+61929
-50701
lines changed

11 files changed

+61929
-50701
lines changed

CHANGES.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ Compute
108108
(#1983)
109109
[@cdfmlr]
110110

111+
- [Amazon S3] Add support for ``me-central-1`` region.
112+
(#2030)
113+
[@seifertdan]
114+
111115
Storage
112116
~~~~~~~
113117

@@ -135,6 +139,11 @@ Other / Development
135139
(#1994)
136140
[Tomaz Muraus - @Kami]
137141

142+
- Add a workaround so tests work with pytest >= 8.2. Also use latest version of
143+
pytest for running tests.
144+
(#2033)
145+
[Steve Kowalik - @s-t-e-v-e-n-k]
146+
138147
Changes in Apache Libcloud 3.8.0
139148
--------------------------------
140149

contrib/scrape-ec2-prices.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
# Buffer size for ijson.parse() function. Larger buffer size results in increased memory
3333
# consumption, but faster parsing.
34-
IJSON_BUF_SIZE = 10 * 65536
34+
IJSON_BUF_SIZE = 30 * 65536
3535

3636
# same URL as the one used by scrape-ec2-sizes.py, now it has official data on pricing
3737
URL = "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonEC2/current/index.json"

libcloud/compute/constants/ec2_instance_types.py

Lines changed: 11941 additions & 8820 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)