Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

merge from master #1309

Merged
merged 2 commits into from
May 30, 2017
Merged

merge from master #1309

merged 2 commits into from
May 30, 2017

Commits on May 30, 2017

  1. PHP streaming retry and exception tests (googleapis#1306) 

    * Remove retry settings from PHP streaming methods
* Update exception tests
    @michaelbausor
    michaelbausor authored May 30, 2017
    Configuration menu
    Copy the full SHA
    a7603d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/googleapis/toolkit into d… 

    …iscogapic
    @garrettjonesgoogle
    garrettjonesgoogle committed May 30, 2017
    Configuration menu
    Copy the full SHA
    b08fc02 View commit details
    Browse the repository at this point in the history