Merge branch 'master' of github.com:grpc/grpc into server_auth_context

pull/1672/head
Julien Boeuf 10 years ago
commit f4547404be
  1. 2
      Makefile
  2. 2
      build.json
  3. 2
      tools/doxygen/Doxyfile.c++
  4. 2
      tools/doxygen/Doxyfile.c++.internal
  5. 2
      tools/doxygen/Doxyfile.core
  6. 2
      tools/doxygen/Doxyfile.core.internal
  7. 3
      tools/run_tests/run_tests.py

@ -308,7 +308,7 @@ E = @echo
Q = @
endif
VERSION = 0.9.0.0
VERSION = 0.9.1.0
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

@ -7,7 +7,7 @@
"version": {
"major": 0,
"minor": 9,
"micro": 0,
"micro": 1,
"build": 0
}
},

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 0.9.0.0
PROJECT_NUMBER = 0.9.1.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 0.9.0.0
PROJECT_NUMBER = 0.9.1.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 0.9.0.0
PROJECT_NUMBER = 0.9.1.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 0.9.0.0
PROJECT_NUMBER = 0.9.1.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

@ -301,7 +301,8 @@ _CONFIGS = {
'msan': SimpleConfig('msan'),
'ubsan': SimpleConfig('ubsan'),
'asan': SimpleConfig('asan', environ={
'ASAN_OPTIONS': 'detect_leaks=1:color=always:suppressions=tools/tsan_suppressions.txt'}),
'ASAN_OPTIONS': 'detect_leaks=1:color=always:suppressions=tools/tsan_suppressions.txt',
'LSAN_OPTIONS': 'report_objects=1'}),
'asan-noleaks': SimpleConfig('asan', environ={
'ASAN_OPTIONS': 'detect_leaks=0:color=always:suppressions=tools/tsan_suppressions.txt'}),
'gcov': SimpleConfig('gcov'),

Loading…
Cancel
Save