Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge apache/incubator-brpc master #2

Merged
merged 89 commits into from
Jun 30, 2021
Merged

Merge apache/incubator-brpc master #2

merged 89 commits into from
Jun 30, 2021

Conversation

serverglen
Copy link
Owner

Merge apache/incubator-brpc master

serverglen and others added 30 commits September 28, 2020 10:47
@serverglen
update status.md first latency percentile
bec4cac
@serverglen
delete baidu inner svn code link
b8f21a3
@serverglen
update client.md file naming-service demo machine list
3e6b5aa
Fix build break for clang 10.0.1
3a928dd
@jamesge
Merge pull request #1261 from thanksunix/clang-build
a4e28d6 
Fix build break for clang 10.0.1
coding style fix in brpc/trackme.cpp
123e444
@jamesge
Merge pull request #1270 from gydong/master
b1f7ea0 
coding style fix in brpc/trackme.cpp
@warriorpaw
Fix the compile error when using GCC compiler with asan enabled on Li…
c0453d9 
…nux platform.

Only reproduced and tested with x64 linux and gcc 7 / 8 / 10.
Not sure if this error exist on other platforms.
Add rpm packaging spec
5fa8506
@jamesge
fix errors with clang++ 11 on MacOS Catalina
a78a34e
@chenzhangyi
Compatibility improvement of protobuf json format and spring http spec
f965d4e
@jamesge
Merge pull request #1292 from apache/http_improve
a624f99 
Compatibility improvement of protobuf json format and spring http spec
@jamesge
Update getting_started.md
2aea691
@jamesge
Add SessionLog to remember session-level kv
e3782eb
@jamesge
fix some warnings
74d156c
@jamesge
add Controller.SessionKV() to record and print session-level KV; Add …
86acfa8 
…LOGD/I/W/E/F to print contextual log; Add flag -log_as_json to print logs as valid JSON
@jamesge
polish comments on LOG*
6b83e0f
@jamesge
Merge branch 'master' of https://github.com/brpc/brpc
00498f2
@jamesge
Add :: before namespace logging
6d3a6e1
@jamesge
Make code compile for glog
ce7c45f
@jamesge
add a null check in ~LogPostfixDummy
c1dd203
@jamesge
Replace previous hacky impl. of appending postfix to ostream with a s…
5f7e048 
…afer one and lose the -log_as_json support for glog
@jamesge
Use = as non-json sep; Rename LOG* macros to CLOG*
d06e330
@jamesge
Support pass down request_id
20f2b4a
@jamesge
change travis-ci.org to travis-ci.com
31eba30
@lrita
make butil::ScopedVector<T> support initializer_list
6d06398
@lrita
make butil::ScopedVector<T> support initializer_list
cd6fc15
@lrita
make butil::BasicStringPiece<T> support string split functions-family
1015264
@lrita
make butil::BasicStringPiece<T> support string split functions-family
32c05be
@lrita
remove #include <initializer_list> in scoped_vector.h
1c02d48
zyearn and others added 29 commits February 23, 2021 21:00
@zyearn
Remove FlameGraph dependency: remove flamegraph_perl.*
d63782b
@zyearn
Remove FlameGraph dependency: remove flamegraph_perl.h header
885eaec
@yanjianglu
Update flat_map.h
99338e6 
Correct spelling mistakes
@PragmaTwice
Fix typo of a message in CMakeLists.txt
63e3ede
@zyearn
Merge pull request #1370 from PragmaTwice/PragmaTwice-patch-1
b3a948c 
Fix typo of a message in CMakeLists.txt
@stdpain
fix warning in gcc8+
b39fc76
@tbago
Change chinese quotation marks in bvar_c++.md sample code
c78ce8c
@zyearn
Merge pull request #1345 from zyearn/fix_flamegraph_dep
878e32b 
Remove FlameGraph dependency to solve category b license conflict.
@gogdizzy
Fix build failure on macOS with FlameGraph
a2181ac
@zyearn
Merge pull request #1411 from gogdizzy/fix-flame-on-mac
ebb8a6e 
Fix build failure on macOS with FlameGraph
@guodongxiaren
fix Describe in docs
387e91e 
文档中的代码示例写错了，需要实现的函数名应为Describe
@guodongxiaren
fix log level for glog
4196217
@zyearn
Merge pull request #1413 from guodongxiaren/fix_doc
2bd98fc 
Fix the method name of MyService in docs/(cn|en)/status.md
@codroc
Update bvar.md
118174d
@chenzhangyi
Merge pull request #1414 from codroc/patch-2
8a6f9c1 
Update bvar.md
@chenzhangyi
Merge pull request #1415 from guodongxiaren/fix_la_log
56ad6b1 
修改la策略中的异常日志的级别，避免在使用glog的情况下core dump
@chenzhangyi
Merge pull request #1396 from tbago/fixed_typo
6c8c81f 
Change chinese quotation marks in bvar_c++.md sample code
@guodongxiaren
SampleRequest to SampledRequest
db9e92f
@zyearn
Merge pull request #1420 from guodongxiaren/fix_SampleRequest
cb22927 
Fix typo: SampleRequest -> SampledRequest
@guodongxiaren
chan resize +1
9ce0402
@zyearn
Merge pull request #1422 from guodongxiaren/fix_rpc_replay
60d6a2f 
Fix ChannelGroup vector resize bug of tools/rpc_replay/rpc_replay.cpp during Initialization
@guodongxiaren
fix_BRPC_VALIDATE_GFLAG
1ecb07b
@chenzhangyi
Merge pull request #1381 from stdpain/master
e197f33 
fix warning in gcc8+
@guodongxiaren
clear no trival copy-assignment warning
9186202
@zyearn
Merge pull request #1426 from guodongxiaren/fix_BRPC_VALIDATE_GFLAG
36828a5 
Fix typo in doc: BRPC_RPC_VALIDATE_GFLAG -> BRPC_VALIDATE_GFLAG
@zyearn
Merge pull request #1427 from guodongxiaren/clear_warning_no_trivial_…
69e2d2a 
…copy_assignment

Fix -Wclass-memaccess warnings in high version GCC
@tanzhongyi003
rm DISCLAIMER-WIP and use DISCLAIMER for 1.0 release
b0e0332
@jamesge
Merge pull request #1432 from tanzhongyi003/master
b57dd31 
rm DISCLAIMER-WIP and use DISCLAIMER for 1.0 release
@jamesge
Merge pull request #1352 from yanjianglu/master
0650582 
Update flat_map.h
@serverglen serverglen merged commit 10a9c85 into serverglen:error_var_name Jun 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.