Skip to content

Commit

Permalink
fix sub modules
Browse files Browse the repository at this point in the history
taohe committed Aug 2, 2017
1 parent 08f6c53 commit 6e47491
Showing 4 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
[submodule "third_party/colib"]
path = third_party/colib
url = https://github.com/Tencent/libco
[submodule "third_party/phxrpc"]
path = third_party/phxrpc
url = https://github.com/Tencent/phxrpc
[submodule "third_party/phxpaxos"]
path = third_party/phxpaxos
url = https://github.com/Tencent/phxpaxos
[submodule "third_party/leveldb"]
path = third_party/leveldb
url = https://github.com/google/leveldb
@@ -16,3 +7,12 @@
[submodule "third_party/glog"]
path = third_party/glog
url = https://github.com/google/glog
[submodule "third_party/colib"]
path = third_party/colib
url = https://github.com/Tencent/libco
[submodule "third_party/phxpaxos"]
path = third_party/phxpaxos
url = https://github.com/Tencent/phxpaxos
[submodule "third_party/phxrpc"]
path = third_party/phxrpc
url = https://github.com/Tencent/phxrpc
2 changes: 1 addition & 1 deletion third_party/colib
Submodule colib updated from 44c4ae to 7e8d00
2 changes: 1 addition & 1 deletion third_party/phxpaxos
Submodule phxpaxos updated 63 files
+11 −8 README.md
+11 −8 README.zh_CN.md
+15 −0 include/phxpaxos/breakpoint.h
+2 −1 include/phxpaxos/log.h
+2 −0 include/phxpaxos/node.h
+12 −1 include/phxpaxos/options.h
+16 −3 include/phxpaxos/sm.h
+39 −1 plugin/monitor/monitor_bp.cpp
+23 −0 plugin/monitor/monitor_bp.h
+8 −0 sample/phxelection/election.cpp
+3 −0 sample/phxelection/election.h
+1 −1 sample/phxkv/kv_paxos.cpp
+13 −16 src/algorithm/checkpoint_sender.cpp
+1 −0 src/algorithm/checkpoint_sender.h
+3 −1 src/algorithm/commitctx.cpp
+1 −1 src/algorithm/commitctx.h
+108 −10 src/algorithm/instance.cpp
+12 −1 src/algorithm/instance.h
+2 −2 src/algorithm/learner.cpp
+1 −1 src/algorithm/learner.h
+28 −6 src/algorithm/learner_sender.cpp
+3 −0 src/algorithm/learner_sender.h
+20 −0 src/algorithm/proposer.cpp
+4 −0 src/algorithm/proposer.h
+5 −5 src/benchmark/bench_server.cpp
+5 −0 src/comm/breakpoint.cpp
+3 −3 src/comm/commdef.h
+8 −8 src/comm/inside_options.cpp
+8 −8 src/comm/inside_options.h
+29 −0 src/comm/logger.cpp
+4 −0 src/comm/logger.h
+2 −0 src/comm/options.cpp
+1 −1 src/communicate/dfnetwork.cpp
+3 −3 src/communicate/tcp/notify.cpp
+85 −13 src/communicate/tcp/tcp.cpp
+42 −4 src/communicate/tcp/tcp.h
+8 −2 src/communicate/tcp/tcp_acceptor.cpp
+1 −0 src/communicate/tcp/tcp_acceptor.h
+16 −6 src/communicate/udp.cpp
+2 −0 src/communicate/udp.h
+1 −1 src/master/Makefile.define
+29 −18 src/master/master_mgr.cpp
+6 −3 src/master/master_mgr.h
+81 −6 src/master/master_sm.cpp
+11 −1 src/master/master_sm.h
+1 −0 src/master/master_sm.proto
+31 −6 src/node/group.cpp
+13 −1 src/node/group.h
+1 −0 src/node/node.cpp
+60 −9 src/node/pnode.cpp
+6 −2 src/node/pnode.h
+18 −7 src/node/propose_batch.cpp
+4 −1 src/node/propose_batch.h
+10 −1 src/sm-base/sm.cpp
+87 −0 src/sm-base/sm_base.cpp
+7 −0 src/sm-base/sm_base.h
+1 −1 src/test/Makefile.define
+7 −2 src/test/test_server.cpp
+57 −1 src/test/test_sm.cpp
+14 −0 src/test/test_sm.h
+2 −1 src/ut/make_class.cpp
+6 −6 tools/check_install.py
+2 −2 tools/create_makefile.py

0 comments on commit 6e47491

Please sign in to comment.