Merge lp:~tcuthbert/wordpress/openstack-objectstorage into lp:~canonical-sysadmins/wordpress/openstack-objectstorage
Proposed by
Thomas Cuthbert
Status: | Merged |
---|---|
Approved by: | Barry Price |
Approved revision: | 6 |
Merged at revision: | 6 |
Proposed branch: | lp:~tcuthbert/wordpress/openstack-objectstorage |
Merge into: | lp:~canonical-sysadmins/wordpress/openstack-objectstorage |
Diff against target: |
37 lines (+3/-3) 3 files modified
classes/swift.php (+1/-1) src/OpenStack/ObjectStore/v1/Resource/StreamWrapper.php (+1/-1) src/OpenStack/ObjectStore/v1/Resource/SwiftObject.php (+1/-1) |
To merge this branch: | bzr merge lp:~tcuthbert/wordpress/openstack-objectstorage |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Barry Price | Approve | ||
Canonical IS Reviewers | Pending | ||
Review via email: mp+384694@code.launchpad.net |
Commit message
Rename to SwiftObject as Object is a reserved keyword in php7
To post a comment you must log in.
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.