fix conflicts
This commit is contained in:
commit
67d3e56946
|
@ -28,7 +28,6 @@ static struct {
|
||||||
|
|
||||||
static int32_t vnodeParseCreateVnodeReq(SRpcMsg *rpcMsg, int32_t *vgId, SVnodeCfg *pCfg) {
|
static int32_t vnodeParseCreateVnodeReq(SRpcMsg *rpcMsg, int32_t *vgId, SVnodeCfg *pCfg) {
|
||||||
SCreateVnodeMsg *pCreate = rpcMsg->pCont;
|
SCreateVnodeMsg *pCreate = rpcMsg->pCont;
|
||||||
|
|
||||||
*vgId = htonl(pCreate->vgId);
|
*vgId = htonl(pCreate->vgId);
|
||||||
|
|
||||||
pCfg->dropped = 0;
|
pCfg->dropped = 0;
|
||||||
|
|
Loading…
Reference in New Issue