Merge lp:~tcuthbert/wordpress/openstack-objectstorage-k8s into lp:~canonical-sysadmins/wordpress/openstack-objectstorage-k8s

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Thomas Cuthbert
Approved revision: 7
Merged at revision: 7
Proposed branch: lp:~tcuthbert/wordpress/openstack-objectstorage-k8s
Merge into: lp:~canonical-sysadmins/wordpress/openstack-objectstorage-k8s
Diff against target: 29 lines (+3/-3)
1 file modified
src/OpenStack/ObjectStore/v1/Resource/Container.php (+3/-3)
To merge this branch: bzr merge lp:~tcuthbert/wordpress/openstack-objectstorage-k8s
Reviewer Review Type Date Requested Status
Stephen Muss (community) Approve
Joel Sing +1 Approve
Review via email: mp+386794@code.launchpad.net

Commit message

Rename missing 'Object' references to new 'SwiftObject' name

To post a comment you must log in.
Joel Sing (jsing) wrote :

LGTM

review: Approve (+1)
Stephen Muss (stephenmuss) wrote :

lgtm

review: Approve

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Change must be approved by a member of one of the following teams:
Setting status to needs review.

Change must be approved by a member of one of the following teams:
Setting status to needs review.

Change successfully merged at revision 7

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/OpenStack/ObjectStore/v1/Resource/Container.php'
2--- src/OpenStack/ObjectStore/v1/Resource/Container.php 2015-02-11 15:35:31 +0000
3+++ src/OpenStack/ObjectStore/v1/Resource/Container.php 2020-07-03 05:41:30 +0000
4@@ -451,7 +451,7 @@
5 * @throws \OpenStack\Common\Exception when an unexpected (usually
6 * network-related) error condition arises.
7 */
8- public function save(Object $obj, $file = null)
9+ public function save(SwiftObject $obj, $file = null)
10 {
11 if (empty($this->token)) {
12 throw new Exception('Container does not have an auth token.');
13@@ -555,7 +555,7 @@
14 * @throws \OpenStack\Common\Transport\Exception\ResourceNotFoundException if the object does not already
15 * exist on the object storage.
16 */
17- public function updateMetadata(Object $obj)
18+ public function updateMetadata(SwiftObject $obj)
19 {
20 $url = self::objectUrl($this->url, $obj->name());
21 $headers = ['X-Auth-Token' => $this->token];
22@@ -607,7 +607,7 @@
23 * set, the object will be saved into this container. If this is not sent,
24 * the copy will be performed inside of the original container.
25 */
26- public function copy(Object $obj, $newName, $container = null)
27+ public function copy(SwiftObject $obj, $newName, $container = null)
28 {
29 $sourceUrl = self::objectUrl($this->url, $obj->name());
30

Subscribers

People subscribed via source and target branches