Skip to content

Merge 2.7 into develop #11151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jan 26, 2020
Merged

Merge 2.7 into develop #11151

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c362ea9
Use VStorageObjectManager.HostExtendDisk_Task for vSphere 6.5 or newe…
ycliuhw Jan 17, 2020
d2b8649
Change to use re-configure VM for exending disk;
ycliuhw Jan 22, 2020
25a0b4d
Removes unused series argument from newSeries function.
manadart Jan 22, 2020
7aef834
Handle detaching a volume attachment with a plan.
jameinel Jan 22, 2020
1d312f5
Move the populating of the availability zones to the start of loop to…
howbazaar Jan 22, 2020
b285d03
Merge pull request #11139 from jameinel/2.7-detach-volume-state-chang…
jujubot Jan 22, 2020
bb37a5d
Merge pull request #11141 from howbazaar/2.7-fix-provisioner-leak
jujubot Jan 22, 2020
3df9181
Change the text used to match the model-removed error
Jan 21, 2020
bff6151
Merge pull request #11144 from babbageclunk/2.7-fix-destroy-test
jujubot Jan 22, 2020
d7c8ac2
Update test for vSphere resizing disk change;
ycliuhw Jan 23, 2020
6d57dc4
Remove the global read permission check because resizing disk does no…
ycliuhw Jan 23, 2020
5a5aa42
Merge pull request #11137 from ycliuhw/feature/vSphere-disk-resizing
jujubot Jan 23, 2020
c45955f
Adds a unit test to accompany PR #11141 that verifies the worker
manadart Jan 23, 2020
a659955
Merge pull request #11146 from manadart/2.7-provisioner-worker-test
jujubot Jan 23, 2020
8009b40
Changes the location of systemd unit files and start-up scripts.
manadart Jan 23, 2020
e04f31b
Merge pull request #11147 from manadart/relocate-systemd-files
jujubot Jan 24, 2020
4db2f6f
Removes unused systemd default search path directory argument from
manadart Jan 24, 2020
de990d9
Refactors WriteSystemdAgents for clarity and cleans up its usage in
manadart Jan 24, 2020
54017c4
Fixes controller integration test to look in the standard systemd search
manadart Jan 24, 2020
7a38d09
Merge pull request #11150 from manadart/2.7-controller-integration-test
jujubot Jan 24, 2020
ba9f119
Merge pull request #11149 from manadart/2.7-systemd-upgrades
jujubot Jan 24, 2020
c04b861
Merge remote-tracking branch 'upstream/2.7' into 2.8-merge-2.7
Jan 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes controller integration test to look in the standard systemd search 
path for the juju-db service instead of the old /lib/systemd... path.
  • Loading branch information
@manadart
manadart committed Jan 24, 2020
commit 54017c4527b885f3812b3cd8caf3e3bc0e695699
2 changes: 1 addition & 1 deletion tests/suites/controller/mongo_memory_profile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cat_mongo_service() {
# shellcheck disable=SC2046
echo $(juju run -m controller --machine 0 'cat /lib/systemd/system/juju-db/juju-db.service' | grep "^ExecStart")
echo $(juju run -m controller --machine 0 'cat /etc/systemd/system/juju-db.service' | grep "^ExecStart")
}

run_mongo_memory_profile() {
Expand Down