Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

6c998da4

Commit 6c998da4 authored 9 years ago by Vijay Pai

Downloads
- Plain Diff

Merge branch 'master' into loaded

parents 8a2ff736 c77dc397

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/csharp/Grpc.Core/Grpc.Core.csproj 1 addition, 0 deletions

src/csharp/Grpc.Core/Grpc.Core.csproj
src/csharp/Grpc.Core/Logging/NullLogger.cs 122 additions, 0 deletions

src/csharp/Grpc.Core/Logging/NullLogger.cs
src/python/grpcio/grpc/_cython/imports.generated.c 8 additions, 0 deletions

src/python/grpcio/grpc/_cython/imports.generated.c
src/python/grpcio/grpc/_cython/imports.generated.h 8 additions, 0 deletions

src/python/grpcio/grpc/_cython/imports.generated.h
src/python/grpcio/grpc/_cython/loader.c 10 additions, 1 deletion

src/python/grpcio/grpc/_cython/loader.c
src/python/grpcio/grpc/_cython/loader.h 9 additions, 0 deletions

src/python/grpcio/grpc/_cython/loader.h
templates/src/python/grpcio/grpc/_cython/imports.generated.c.template 9 additions, 0 deletions

...c/python/grpcio/grpc/_cython/imports.generated.c.template
templates/src/python/grpcio/grpc/_cython/imports.generated.h.template 8 additions, 0 deletions

...c/python/grpcio/grpc/_cython/imports.generated.h.template

with 175 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment