diff options
author | 2015-04-24 23:24:44 +0200 | |
---|---|---|
committer | 2015-04-24 23:24:44 +0200 | |
commit | fd2bf675f750f440d92bffeb88771e6d9253b498 (patch) | |
tree | 340f8a6b8a5b181c215a90e038b17475a3206855 /src/ruby/lib/grpc.rb | |
parent | 76e49fd80557c33595508686f3450982e63f0fce (diff) | |
parent | 4107ba289747be6fba879e6060d40969f1aee89c (diff) |
Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
include/grpc++/completion_queue.h
Diffstat (limited to 'src/ruby/lib/grpc.rb')
-rw-r--r-- | src/ruby/lib/grpc.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ruby/lib/grpc.rb b/src/ruby/lib/grpc.rb index b0f68035cd..80b5743e91 100644 --- a/src/ruby/lib/grpc.rb +++ b/src/ruby/lib/grpc.rb @@ -30,6 +30,7 @@ require 'grpc/errors' require 'grpc/grpc' require 'grpc/logconfig' +require 'grpc/notifier' require 'grpc/version' require 'grpc/core/time_consts' require 'grpc/generic/active_call' |