Code

Merge 3.3 into main#39

Code

Merged

barrettj12 merged 20 commits intojuju:mainjuju/juju-controller:mainfrom barrettj12:merge-3.3-mainbarrettj12/juju-controller:merge-3.3-mainCopy head branch name to clipboardOct 17, 2023

+46-1

Commits

Commits on May 3, 2023

• Add Charmhub docs link to metadata.yaml

  barrettj12

  committed
  8881c49

  Copy full SHA for 8881c49

Commits on May 10, 2023

• [ci] Add workflow to release to edge

  barrettj12

  committed
  48f5119

  Copy full SHA for 48f5119

• Merge pull request juju#25 from juju/release-ci

  Show description for e2e7502
  wallyworld

  authored
  e2e7502

  Copy full SHA for e2e7502

• [ci/release] change $CHANNEL to $TRACK

  barrettj12

  committed
  5818ef5

  Copy full SHA for 5818ef5

• Merge pull request juju#26 from juju/release-ci2

  Show description for 082ea81
  wallyworld

  authored
  082ea81

  Copy full SHA for 082ea81

Commits on Jul 28, 2023

• Update build_charms_with_cache.yaml to v4

  Show description for 45ffc14
  carlcsaposs-canonical

  authored
  45ffc14

  Copy full SHA for 45ffc14

Commits on Jul 31, 2023

• Merge pull request juju#27 from carlcsaposs-canonical/patch-1

  Show description for b613f09
  barrettj12

  authored
  b613f09

  Copy full SHA for b613f09

Commits on Oct 13, 2023

• Updates github workflow to use Juju 3.1. 3.0 is no longer available.

  

  Joseph Phillips

  authored and

  Joseph Phillips

  committed
  8181a2b

  Copy full SHA for 8181a2b

• Merge pull request juju#29 from manadart/3.2

  Show description for 5449946
  manadart

  authored
  5449946

  Copy full SHA for 5449946

• Merge pull request juju#30 from manadart/3.1

  Show description for 4630276
  manadart

  authored
  4630276

  Copy full SHA for 4630276

• Merge branch 'upstream/3.1' into 3.2

  

  Joseph Phillips

  authored and

  Joseph Phillips

  committed
  95b789f

  Copy full SHA for 95b789f

• Updates installed version of Juju for workflows to 3.2, the version

  Show description for 0cc34c5
  

  Joseph Phillips

  authored and

  Joseph Phillips

  committed
  0cc34c5

  Copy full SHA for 0cc34c5

• Merge pull request juju#31 from manadart/3.2

  Show description for d84c25a
  manadart

  authored
  d84c25a

  Copy full SHA for d84c25a

Commits on Oct 16, 2023

• Merge pull request juju#24 from juju/ch-docs

  Show description for 6b98013
  barrettj12

  authored
  6b98013

  Copy full SHA for 6b98013

• Merge 3.1 into 3.2

  barrettj12

  committed
  5036fa5

  Copy full SHA for 5036fa5

• Merge pull request juju#32 from barrettj12/merge-3.1-3.2

  Show description for af6c621
  barrettj12

  authored
  af6c621

  Copy full SHA for af6c621

• Merge pull request juju#33 from barrettj12/merge-3.2-3.3

  Show description for 38cbd28
  barrettj12

  authored
  38cbd28

  Copy full SHA for 38cbd28

• ci: install Juju from 3.3/beta channel

  barrettj12

  committed
  79a0d52

  Copy full SHA for 79a0d52

• Merge pull request juju#34 from barrettj12/3.3-ci

  Show description for af8e6fb
  barrettj12

  authored
  af8e6fb

  Copy full SHA for af8e6fb

• Merge branch '3.3' into merge-3.3-main

  barrettj12

  committed
  ad156d8

  Copy full SHA for ad156d8