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.

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

Jump to bottom

Backport NPN support into 0.9 release branch. #2176

Merged
merged 4 commits into from
Jun 26, 2015
Merged

Backport NPN support into 0.9 release branch. #2176

merged 4 commits into from
Jun 26, 2015

Commits on Jun 23, 2015

  1. Adding NPN support in 0.9 release branch.

    @jboeuf
    jboeuf committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    a450419 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2015

  1. Adding a check to find NPN-capable OpenSSL. 

    Conflicts:
	Makefile
    @nicolasnoble
    nicolasnoble committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    98c7012 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. Merge pull request #1 from nicolasnoble/npn-in-makefile-for-julien 

    Adding a check to find NPN-capable OpenSSL.
    @jboeuf
    jboeuf committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    85581ed View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-0_9' of github.com:grpc/grpc into release-0_9-npn

    @jboeuf
    jboeuf committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    6e46cef View commit details
    Browse the repository at this point in the history