Fast-forward merge master into maltese-falcon #3146
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Separate out LastLogin from the userDoc into it's own collection. Operate directly on docs in this collection without using txns. Do the same for LastConnection in the envUserDoc. No tests where added as existing behaviour should remain the same and is already covered.
To the singular, as per the implementation source file. Also changed the suite name to match.
envStateCollection.Insert now performs the required modification of inserted documents to isolate them from documents for other environments.
envStateCollection handles this now.
envStateCollection insert munging
state: renamed collections_test.go
...to the singular, as per the implementation source file. Also changed the suite name to match.
---
state: make Inserts into multi-env collections safer
envStateCollection.Insert now performs the required modification of inserted documents to isolate them from documents for other environments.
---
state: status history inserts no longer need to include EnvUUID
envStateCollection handles this now.
(Review request: http://reviews.vapour.ws/r/2496/)
Increment juju to 1.25-beta1 (Review request: http://reviews.vapour.ws/r/2505/)
Master is 1.26-alpha1. (Review request: http://reviews.vapour.ws/r/2512/)
Conflicts: state/upgrades.go state/upgrades_test.go upgrades/steps125.go upgrades/steps125_test.go
State: separate collections for LastLogin and LastConnection Separate out LastLogin from the userDoc into it's own collection. Operate directly on docs in this collection without using txns. Do the same for LastConnection in the envUserDoc. No tests where added as existing behaviour should remain the same and is already covered. (Review request: http://reviews.vapour.ws/r/2250/)
1. multiEnvRunner no longer modifies the []txn.Op it sees in-place. A new copy is created instead. This is safer and less surprising. Big comment from Will about this removed. This lifts a number of restrictions - for example, previously struct values that needed multi-env adjustments weren't supported. 2. The code for munging txn Inserts to address multi-env concerns has been greatly simplified by rounding tripping documents through BSON to bson.D. This also has the benefit of opening up support for document types that weren't allowed before. 3. The envuser code and tests seemed to be the only area that was upset about #1. AddEnvironmentUser has been updated to re-read the new user from the DB so ensure consistent user field values. 4. Moved/removed some dumb and unnecessary internal tests for envuser. More to come...
Fixed tests broken by AssignPrivateIPAddress change in environ.go More tests for space and subnet constraints
…ints Net cli ec2 space constraints EC2 space constraints take into account subnets and availability zones. Fixed map ordering problems in TestSubnets (Review request: http://reviews.vapour.ws/r/2510/)
state: big multi-env txn handling cleanup 1. multiEnvRunner no longer modifies the []txn.Op it sees in-place. A new copy is created instead. This is safer and less surprising. Big comment from Will about this removed. This lifts a number of restrictions - for example, previously struct values that needed multi-env adjustments weren't supported. 2. The code for munging txn Inserts to address multi-env concerns has been greatly simplified by rounding tripping documents through BSON to bson.D. This also has the benefit of opening up support for document types that weren't allowed before. 3. The envuser code and tests seemed to be the only area that was upset about point 1. AddEnvironmentUser has been updated to re-read the new user from the DB so ensure consistent user field values. 4. Moved/removed some dumb and unnecessary internal tests for envuser. More to come... (Review request: http://reviews.vapour.ws/r/2516/)
Revert pr juju#2871 from waigani/last-conn Fixes lp:1489896 regression in juju upgrade. This reverts commit 5656861, reversing changes made to 716cafd. (Review request: http://reviews.vapour.ws/r/2523/)
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
added a commit
that referenced
this pull request
Aug 28, 2015
Fast-forward merge master into maltese-falcon (Review request: http://reviews.vapour.ws/r/2524/)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Review request: http://reviews.vapour.ws/r/2524/)