Merge branch 'release-0_11' of github.com:grpc/grpc into fix-teh-tests

1 files changed, 5 insertions, 5 deletions

diff --git a/doc/ref/core.internal/html/timers_8h_source.html b/doc/ref/core.internal/html/timers_8h_source.html
index a3e72942d6..7d32cbb049 100644
--- a/doc/ref/core.internal/html/timers_8h_source.html
+++ b/doc/ref/core.internal/html/timers_8h_source.html
@@ -23,7 +23,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">GRPC Core
-   &#160;<span id="projectnumber">0.10.0.0</span>
+   &#160;<span id="projectnumber">0.11.0.0</span>
    </div>
   </td>
  </tr>
@@ -178,7 +178,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <div class="line"><a name="l00088"></a><span class="lineno">   88</span>&#160;<span class="preprocessor">  } while (0)</span></div>
 <div class="line"><a name="l00089"></a><span class="lineno">   89</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00090"></a><span class="lineno"><a class="line" href="timers_8h.html#a4de2bf5918f608b72f3c426e4a43e7c8">   90</a></span>&#160;<span class="preprocessor">#define GRPC_TIMER_IMPORTANT_MARK(tag, id) \</span></div>
-<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;<span class="preprocessor">  do {                           \</span></div>
+<div class="line"><a name="l00091"></a><span class="lineno">   91</span>&#160;<span class="preprocessor">  do {                                     \</span></div>
 <div class="line"><a name="l00092"></a><span class="lineno">   92</span>&#160;<span class="preprocessor">  } while (0)</span></div>
 <div class="line"><a name="l00093"></a><span class="lineno">   93</span>&#160;<span class="preprocessor"></span></div>
 <div class="line"><a name="l00094"></a><span class="lineno"><a class="line" href="timers_8h.html#abf4cfef22d1c79525994ba224ac13dba">   94</a></span>&#160;<span class="preprocessor">#define GRPC_TIMER_BEGIN(tag, id) \</span></div>
@@ -246,20 +246,20 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3ae3193d2165aaa3802bb3fca59e3ca8e1"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3ae3193d2165aaa3802bb3fca59e3ca8e1">GRPC_PTAG_TCP_CB_WRITE</a></div><div class="ttdef"><b>Definition:</b> timers.h:66</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3a8564fee65389d96e4b5b4bedcedd2627"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3a8564fee65389d96e4b5b4bedcedd2627">GRPC_PTAG_POLL_FINISHED</a></div><div class="ttdef"><b>Definition:</b> timers.h:65</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3afdd4d7916a4a16fdbb47c3a6cb265e4d"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3afdd4d7916a4a16fdbb47c3a6cb265e4d">GRPC_PTAG_HTTP2_UNLOCK</a></div><div class="ttdef"><b>Definition:</b> timers.h:75</div></div>
-<div class="ttc" id="timers_8h_html_a3464d3fdd0cc9ab2543195d5ee3fec13"><div class="ttname"><a href="timers_8h.html#a3464d3fdd0cc9ab2543195d5ee3fec13">grpc_timers_global_destroy</a></div><div class="ttdeci">void grpc_timers_global_destroy(void)</div><div class="ttdef"><b>Definition:</b> basic_timers.c:141</div></div>
+<div class="ttc" id="timers_8h_html_a3464d3fdd0cc9ab2543195d5ee3fec13"><div class="ttname"><a href="timers_8h.html#a3464d3fdd0cc9ab2543195d5ee3fec13">grpc_timers_global_destroy</a></div><div class="ttdeci">void grpc_timers_global_destroy(void)</div><div class="ttdef"><b>Definition:</b> basic_timers.c:139</div></div>
 <div class="ttc" id="timers_8h_html_a810b9be124a21ed5c4066f2e74112e74"><div class="ttname"><a href="timers_8h.html#a810b9be124a21ed5c4066f2e74112e74">grpc_timer_end</a></div><div class="ttdeci">void grpc_timer_end(int tag, const char *tagstr, void *id, const char *file, int line)</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3a07f5a2d9703f71ede732477257854472"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3a07f5a2d9703f71ede732477257854472">GRPC_PTAG_SENDMSG</a></div><div class="ttdef"><b>Definition:</b> timers.h:63</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3a52fe62d30066246868ec8aee932c24e8"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3a52fe62d30066246868ec8aee932c24e8">GRPC_PTAG_PROTO_SERIALIZE</a></div><div class="ttdef"><b>Definition:</b> timers.h:58</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3a15afe239273be6ec485aea2aff25fb8b"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3a15afe239273be6ec485aea2aff25fb8b">GRPC_PTAG_OTHER_BASE</a></div><div class="ttdef"><b>Definition:</b> timers.h:81</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3aac2e05e178ae0a1dba7f00723355ba4b"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3aac2e05e178ae0a1dba7f00723355ba4b">GRPC_PTAG_PROTO_DESERIALIZE</a></div><div class="ttdef"><b>Definition:</b> timers.h:59</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3aa32b263c7af6b5be92daa442c772618a"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3aa32b263c7af6b5be92daa442c772618a">GRPC_PTAG_HTTP2_UNLOCK_CLEANUP</a></div><div class="ttdef"><b>Definition:</b> timers.h:76</div></div>
-<div class="ttc" id="timers_8h_html_ac34b4d619b9ed067e02e037b21a6feac"><div class="ttname"><a href="timers_8h.html#ac34b4d619b9ed067e02e037b21a6feac">grpc_timers_global_init</a></div><div class="ttdeci">void grpc_timers_global_init(void)</div><div class="ttdef"><b>Definition:</b> basic_timers.c:140</div></div>
+<div class="ttc" id="timers_8h_html_ac34b4d619b9ed067e02e037b21a6feac"><div class="ttname"><a href="timers_8h.html#ac34b4d619b9ed067e02e037b21a6feac">grpc_timers_global_init</a></div><div class="ttdeci">void grpc_timers_global_init(void)</div><div class="ttdef"><b>Definition:</b> basic_timers.c:138</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3">grpc_profiling_tags</a></div><div class="ttdeci">grpc_profiling_tags</div><div class="ttdef"><b>Definition:</b> timers.h:53</div></div>
 <div class="ttc" id="timers_8h_html_a3924e8ccd8dd2091f770739703718fe3a1cf6704d24c17b339a283c1e1f86ae0f"><div class="ttname"><a href="timers_8h.html#a3924e8ccd8dd2091f770739703718fe3a1cf6704d24c17b339a283c1e1f86ae0f">GRPC_PTAG_TCP_WRITE</a></div><div class="ttdef"><b>Definition:</b> timers.h:67</div></div>
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Aug 5 2015 08:17:07 for GRPC Core by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Sep 3 2015 09:44:13 for GRPC Core by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.6
 </small></address>