/juju

merge 2.2 into develop #7997

Merged
merged 6 commits into from Oct 31, 2017

Conversation

Reviewers

@wallyworld wallyworld

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@babbageclunk @jujubot @wallyworld
@babbageclunk
Member

babbageclunk commented Oct 31, 2017

Description of change

Merge my changes in from the 2.2 branch primarily so I can fix the conflicts that #7991 caused rather than leaving them for someone else to puzzle out.

Also gets rid of some debug logging that was landed inadvertently.

babbageclunk and others added some commits Oct 30, 2017

@babbageclunk
Set model.Type when exporting a v4 Model 
The description dependency was updated on the 2.2 branch (such that it
now emits v4 models). That means we need to set the type to "iaas",
otherwise importing them on a 2.3 branch controller will fail when it
checks the model type.

Part of fixing https://bugs.launchpad.net/juju/+bug/1728486
da10941
@babbageclunk
Limit exported status history entries to 20 
We've seen migrations fail because the controller ran out of memory
trying to serialise exported models with lots of status history. It's
not really important to maintain all of the history when migrating.
083aec2
@jujubot
Merge pull request #7991 from babbageclunk/set-model-type-2.2 
migration: set model.Type now that 2.2 is exporting a v4 Model

## Description of change

The description dependency was updated on the 2.2 branch (such that it
now exports v4 models). For correctness sake we should be setting the model type
(although I will also change the 2.3 branch to accept a blank model type so that migrating
from a 2.2.5 or .6 controller to a 2.3 one will work).

Includes a driveby to limit status history entries to 20 in exported models.

## QA steps

Bootstrap a 2.3-beta1 controller (B) and a 2.2 branch one with this change in it (A).
Migrate a model from A to B. It should succeed, and there shouldn't be an error about
blank model types.

## Bug reference

Part of the fix for https://bugs.launchpad.net/juju/+bug/1728486
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
8a1aa58
@babbageclunk
Remove debug logging
668d9f6
@jujubot
Merge pull request #7994 from babbageclunk/remove-debug-logging 
Remove debug logging

## Description of change

This was inadvertently committed with another change, but shouldn't be included in the output when upgrading Juju.

## QA steps

Bootstrap a 2.2.6 controller, then upgrade it to this version. No critical log message should be emitted.
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
ae2506a
@babbageclunk
Merge 2.2 branch into develop 
Primarily so I can fix the conflicts that
#7991 caused rather than leaving
them for someone else to puzzle out.
55cbfcf
@babbageclunk
Member

babbageclunk commented Oct 31, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Oct 31, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit a32c55e into juju:develop Oct 31, 2017
1 check failed

1 check failed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details

@babbageclunk babbageclunk deleted the babbageclunk:merge2.2 branch Oct 31, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment