Merge branch 'optionalize_census' into optionalize_resolvers

pull/6042/head
Craig Tiller 9 years ago
commit 17325f825c
  1. 2
      src/core/ext/census/grpc_filter.c
  2. 2
      src/core/ext/transport/chttp2/client/insecure/channel_create.c
  3. 2
      tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh

@ -42,9 +42,9 @@
#include <grpc/support/slice.h>
#include <grpc/support/time.h>
#include "src/core/lib/channel/channel_stack.h"
#include "src/core/ext/census/census_interface.h"
#include "src/core/ext/census/census_rpc_stats.h"
#include "src/core/lib/channel/channel_stack.h"
#include "src/core/lib/transport/static_metadata.h"
typedef struct call_data {

@ -40,8 +40,8 @@
#include <grpc/support/slice.h>
#include <grpc/support/slice_buffer.h>
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/ext/census/grpc_filter.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/channel/client_channel.h"
#include "src/core/lib/channel/compress_filter.h"

@ -31,7 +31,7 @@
set -e
# directories to run against
DIRS="src/core src/cpp test/core test/cpp include"
DIRS="src/core/lib src/core/ext src/cpp test/core test/cpp include"
# file matching patterns to check
GLOB="*.h *.c *.cc"

Loading…
Cancel
Save