Merge github.com:grpc/grpc into travvy

Conflicts:
	.travis.yml

.travis.yml

@@ -2,20 +2,27 @@ language: cpp
 before_install:
   - sudo add-apt-repository ppa:yjwong/gflags -y
   - sudo add-apt-repository ppa:h-rayflood/llvm -y
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+  - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
+  - echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
   - sudo apt-get update -qq
   - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv clang-3.5
   - sudo pip install cpp-coveralls mako simplejson
+  - sudo apt-get install -qq mono-devel nunit
+  - wget www.nuget.org/NuGet.exe -O nuget.exe
 env:
   global:
     - RUBY_VERSION=2.1
     - COVERALLS_PARALLEL=true
+    - NUGET="mono nuget.exe"
   matrix:
     - CONFIG=opt TEST=sanity
     - CONFIG=dbg TEST="c c++"
     - CONFIG=opt TEST="c c++"
     - CONFIG=opt TEST=node
     - CONFIG=opt TEST=ruby
     - CONFIG=opt TEST=python
+    - CONFIG=opt TEST=csharp
     - CONFIG=gcov TEST="c c++"
     - USE_GCC=4.4 CONFIG=opt TEST=build
     - USE_GCC=4.5 CONFIG=opt TEST=build

BUILD

@@ -147,7 +147,6 @@ cc_library(
     "src/core/channel/client_setup.h",
     "src/core/channel/connected_channel.h",
     "src/core/channel/http_client_filter.h",
-    "src/core/channel/http_filter.h",
     "src/core/channel/http_server_filter.h",
     "src/core/channel/noop_filter.h",
     "src/core/compression/algorithm.h",
@@ -247,7 +246,6 @@ cc_library(
     "src/core/tsi/fake_transport_security.c",
     "src/core/tsi/ssl_transport_security.c",
     "src/core/tsi/transport_security.c",
-    "src/core/channel/call_op_string.c",
     "src/core/channel/census_filter.c",
     "src/core/channel/channel_args.c",
     "src/core/channel/channel_stack.c",
@@ -256,7 +254,6 @@ cc_library(
     "src/core/channel/client_setup.c",
     "src/core/channel/connected_channel.c",
     "src/core/channel/http_client_filter.c",
-    "src/core/channel/http_filter.c",
     "src/core/channel/http_server_filter.c",
     "src/core/channel/noop_filter.c",
     "src/core/compression/algorithm.c",
@@ -344,6 +341,7 @@ cc_library(
     "src/core/transport/metadata.c",
     "src/core/transport/stream_op.c",
     "src/core/transport/transport.c",
+    "src/core/transport/transport_op_string.c",
   ],
   hdrs = [
     "include/grpc/grpc_security.h",
@@ -375,7 +373,6 @@ cc_library(
     "src/core/channel/client_setup.h",
     "src/core/channel/connected_channel.h",
     "src/core/channel/http_client_filter.h",
-    "src/core/channel/http_filter.h",
     "src/core/channel/http_server_filter.h",
     "src/core/channel/noop_filter.h",
     "src/core/compression/algorithm.h",
@@ -456,7 +453,6 @@ cc_library(
     "src/core/transport/transport.h",
     "src/core/transport/transport_impl.h",
     "src/core/surface/init_unsecure.c",
-    "src/core/channel/call_op_string.c",
     "src/core/channel/census_filter.c",
     "src/core/channel/channel_args.c",
     "src/core/channel/channel_stack.c",
@@ -465,7 +461,6 @@ cc_library(
     "src/core/channel/client_setup.c",
     "src/core/channel/connected_channel.c",
     "src/core/channel/http_client_filter.c",
-    "src/core/channel/http_filter.c",
     "src/core/channel/http_server_filter.c",
     "src/core/channel/noop_filter.c",
     "src/core/compression/algorithm.c",
@@ -553,6 +548,7 @@ cc_library(
     "src/core/transport/metadata.c",
     "src/core/transport/stream_op.c",
     "src/core/transport/transport.c",
+    "src/core/transport/transport_op_string.c",
   ],
   hdrs = [
     "include/grpc/byte_buffer.h",
@@ -579,7 +575,6 @@ cc_library(
     "src/cpp/client/channel.h",
     "src/cpp/proto/proto_utils.h",
     "src/cpp/server/thread_pool.h",
-    "src/cpp/util/time.h",
     "src/cpp/client/secure_credentials.cc",
     "src/cpp/server/secure_server_credentials.cc",
     "src/cpp/client/channel.cc",
@@ -621,6 +616,7 @@ cc_library(
     "include/grpc++/generic_stub.h",
     "include/grpc++/impl/call.h",
     "include/grpc++/impl/client_unary_call.h",
+    "include/grpc++/impl/grpc_library.h",
     "include/grpc++/impl/internal_stub.h",
     "include/grpc++/impl/rpc_method.h",
     "include/grpc++/impl/rpc_service_method.h",
@@ -640,6 +636,7 @@ cc_library(
     "include/grpc++/status_code_enum.h",
     "include/grpc++/stream.h",
     "include/grpc++/thread_pool_interface.h",
+    "include/grpc++/time.h",
   ],
   includes = [
     "include",
@@ -659,7 +656,6 @@ cc_library(
     "src/cpp/client/channel.h",
     "src/cpp/proto/proto_utils.h",
     "src/cpp/server/thread_pool.h",
-    "src/cpp/util/time.h",
     "src/cpp/client/channel.cc",
     "src/cpp/client/channel_arguments.cc",
     "src/cpp/client/client_context.cc",
@@ -699,6 +695,7 @@ cc_library(
     "include/grpc++/generic_stub.h",
     "include/grpc++/impl/call.h",
     "include/grpc++/impl/client_unary_call.h",
+    "include/grpc++/impl/grpc_library.h",
     "include/grpc++/impl/internal_stub.h",
     "include/grpc++/impl/rpc_method.h",
     "include/grpc++/impl/rpc_service_method.h",
@@ -718,6 +715,7 @@ cc_library(
     "include/grpc++/status_code_enum.h",
     "include/grpc++/stream.h",
     "include/grpc++/thread_pool_interface.h",
+    "include/grpc++/time.h",
   ],
   includes = [
     "include",