msg/async: fix variable type to make it same to EventCenter::init() incoming parameter type

[shangfufei]

The function EventCenter::init() first incoming parameter type is "int", but variable InitEventNumber's type is "uint64_t", this modification makes them same.

Signed-off-by: shangfufei shangfufei@inspur.com

[stale]

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
If you are a maintainer or core committer, please follow-up on this issue to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

[yuriw]

@shangfufei @neha-ojha needs rebase

--- pr 20735 --- pulling https://github.com/shangfufei/ceph.git branch wip-fix-type
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Total 6 (delta 5), reused 5 (delta 5), pack-reused 1
Unpacking objects: 100% (6/6), done.
From https://github.com/shangfufei/ceph

• branch wip-fix-type -> FETCH_HEAD
  Auto-merging src/msg/async/Stack.cc
  CONFLICT (file/directory): There is a directory with name src/dmclock in 92b8424. Adding src/dmclock as src/dmclock~HEAD
  Adding qa/suites/rbd/mirror/cluster
  Adding qa/suites/rbd/mirror/base
  Adding qa/suites/multimds/thrash/mount
  Adding qa/suites/multimds/basic/mount
  warning: inexact rename detection was skipped due to too many files.
  warning: you may want to set your merge.renamelimit variable to at least 2075 and retry the command.
  Automatic merge failed; fix conflicts and then commit the result.
  Traceback (most recent call last):
  File "/home/yuriw/wip_master/src/script/build-integration-branch", line 62, in
  assert not r
  AssertionError

[gregsfortytwo]

@yuriw I had a similar issue today, but if you'll notice it says the conflict is on src/dmclock — which is a submodule!

Can you try just "git add src/dmclock; git commit" on the merge where this happens and continue?

[yuriw]

still no love :(