diff options
author | 2016-03-28 08:29:05 -0700 | |
---|---|---|
committer | 2016-03-28 08:29:05 -0700 | |
commit | 9d77ed5e2df5eabed41e0acac511d2f2edff3aad (patch) | |
tree | 51355e20b28e7515cc90922e2e3f3e0399992f9a /test/core/end2end/fixtures/h2_census.c | |
parent | ef37d7cd4eee37689380e727a268fbb06f286fcb (diff) | |
parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) |
Merge github.com:grpc/grpc into accounting
Diffstat (limited to 'test/core/end2end/fixtures/h2_census.c')
-rw-r--r-- | test/core/end2end/fixtures/h2_census.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/core/end2end/fixtures/h2_census.c b/test/core/end2end/fixtures/h2_census.c index e74c9ae243..4d89a8f8c3 100644 --- a/test/core/end2end/fixtures/h2_census.c +++ b/test/core/end2end/fixtures/h2_census.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,6 +35,12 @@ #include <string.h> +#include <grpc/support/alloc.h> +#include <grpc/support/host_port.h> +#include <grpc/support/log.h> +#include <grpc/support/sync.h> +#include <grpc/support/thd.h> +#include <grpc/support/useful.h> #include "src/core/channel/channel_args.h" #include "src/core/channel/client_channel.h" #include "src/core/channel/connected_channel.h" @@ -42,12 +48,6 @@ #include "src/core/surface/channel.h" #include "src/core/surface/server.h" #include "src/core/transport/chttp2_transport.h" -#include <grpc/support/alloc.h> -#include <grpc/support/host_port.h> -#include <grpc/support/log.h> -#include <grpc/support/sync.h> -#include <grpc/support/thd.h> -#include <grpc/support/useful.h> #include "test/core/util/port.h" #include "test/core/util/test_config.h" |