Skip to content
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.

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

Don't set ACL when predefinedAcl is defined #401

Merged
merged 1 commit into from
Mar 16, 2017

Conversation

dwsupplee
Copy link
Contributor

Closes: #392

@dwsupplee dwsupplee added the api: storage Issues related to the Cloud Storage API. label Mar 16, 2017
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Mar 16, 2017

// can only set predefinedAcl or acl
if (isset($options['predefinedAcl'])) {
$options['acl'] = null;

This comment was marked as spam.

This comment was marked as spam.

@jdpedrie
Copy link
Contributor

LGTM

@dwsupplee dwsupplee merged commit 40cb8c2 into googleapis:master Mar 16, 2017
@dwsupplee dwsupplee deleted the acl-fix branch March 16, 2017 15:37
@jdpedrie jdpedrie mentioned this pull request Mar 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: storage Issues related to the Cloud Storage API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants