Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: grpc/grpc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: cj525/grpc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 28 files changed
  • 1 contributor

Commits on Nov 27, 2015

  1. Casting required for x64 build in VS2013

    @cj525
    cj525 committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    92b5eaf View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2015

  1. C#: Abstracted P/Invoke to allow AnyCPU, x86, and x64 to work.

    @cj525
    cj525 committed Nov 28, 2015
    Configuration menu
    Copy the full SHA
    a5fa484 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2015

  1. Add ability to disable logging programmatically

    @cj525
    cj525 committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    ebd3ad6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:cj525/grpc

    @cj525
    cj525 committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    955cf6c View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2015

  1. Let OSX try to work

    @cj525
    cj525 committed Dec 3, 2015
    Configuration menu
    Copy the full SHA
    718e692 View commit details
    Browse the repository at this point in the history

  2. Let 32 bit Linux try to work

    @cj525
    cj525 committed Dec 3, 2015
    Configuration menu
    Copy the full SHA
    5c569af View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2015

  1. Made ThreadPoolSize adjustable

    @cj525
    cj525 committed Dec 6, 2015
    Configuration menu
    Copy the full SHA
    2f32cf5 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2015

  1. Move PlatformInvocation method to top of class

    @cj525
    cj525 committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    5cfac16 View commit details
    Browse the repository at this point in the history

  2. Set completion variable before calling method that will use it

    @cj525
    cj525 committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    cb72e25 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2015

  1. Changed exception type on platform invocation dispatch

    @cj525
    cj525 committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    b3112a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2015

  1. Merge branch 'master' of https://github.com/grpc/grpc 

    Conflicts:
	src/core/iomgr/tcp_windows.c
	src/core/security/json_token.c
	src/csharp/Grpc.Core/Grpc.Core.csproj
	src/csharp/Grpc.Core/Internal/CallSafeHandle.cs
	src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs
	vsprojects/vcxproj/grpc_csharp_ext/grpc_csharp_ext.vcxproj
    @cj525
    cj525 committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    939cd05 View commit details
    Browse the repository at this point in the history

  2. Merge fixes for 64-bit build

    @cj525
    cj525 committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    e8e6a21 View commit details
    Browse the repository at this point in the history

  3. Fixes from merge

    @cj525
    cj525 committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    86d89b0 View commit details
    Browse the repository at this point in the history
Loading