Merge PR #29780 into master

Browse Source

* refs/pull/29780/head:
	osd/PeeringState: semi-colon after DECLARE_LOCALS
	osd/PeeringState: on_new_interval on child PG after split

Reviewed-by: Samuel Just <sjust@redhat.com>

...

This commit is contained in:

Sage Weil 2019-08-22 12:52:16 -05:00

parent 2dca76ac84 6fcb367d6a

commit d850edf0f9

1 changed files with 138 additions and 138 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276

src/osd/PeeringState.cc

View File

File diff suppressed because it is too large Load Diff