Commit d1c9cb2
authored
Merge pull request #848 from juju/release-2.9.42.2
#848
## What's Changed
* [JUJU-3253] add missing force in bundle deployment by @juanmanuel-tirado in #815
* [JUJU-3348] Fix assumes parsing by @juanmanuel-tirado in #820
* [JUJU-3404] Pass series info into origin for ResolveCharm by @cderici in #825
* Fix _resolve_charm errors by @cderici in #834
* [JUJU-3583] wait_for_idle to not block when enough units are ready by @cderici in #840
* [JUJU-3565] Expect and handle exceptions from the AllWatcher task by @cderici in #833
* Fixes to pass the CI problems regarding missing postgresql charm. by @juanmanuel-tirado in #847
* [JUJU-3641] Fix local charm base channel discovery by @cderici in #846
[JUJU-3253]: https://warthogs.atlassian.net/browse/JUJU-3253?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-3348]: https://warthogs.atlassian.net/browse/JUJU-3348?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-3404]: https://warthogs.atlassian.net/browse/JUJU-3404?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-3583]: https://warthogs.atlassian.net/browse/JUJU-3583?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-3565]: https://warthogs.atlassian.net/browse/JUJU-3565?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-3641]: https://warthogs.atlassian.net/browse/JUJU-3641?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ2 files changed
Lines changed: 21 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
12 | 26 | | |
13 | | - | |
| 27 | + | |
14 | 28 | | |
15 | 29 | | |
16 | 30 | | |
17 | 31 | | |
| 32 | + | |
| 33 | + | |
18 | 34 | | |
19 | 35 | | |
20 | 36 | | |
21 | 37 | | |
22 | | - | |
23 | 38 | | |
24 | 39 | | |
25 | 40 | | |
| |||
28 | 43 | | |
29 | 44 | | |
30 | 45 | | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | 46 | | |
37 | 47 | | |
38 | 48 | | |
39 | 49 | | |
40 | 50 | | |
41 | | - | |
42 | | - | |
43 | 51 | | |
44 | 52 | | |
45 | 53 | | |
| |||
0 commit comments