Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion PR for #6564 #1350

Merged
merged 4 commits into from
Jul 8, 2020
Merged

Companion PR for #6564 #1350

merged 4 commits into from
Jul 8, 2020

Conversation

@pscott
Copy link
Contributor

@pscott pscott commented Jul 3, 2020 •
edited
Loading

@parity-cla-bot
Copy link

It looks like @pscott signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@pscott pscott self-assigned this Jul 3, 2020
@pscott pscott added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Jul 3, 2020
@tomaka
Copy link
Contributor

tomaka commented Jul 6, 2020 •
edited
Loading

Please add links between the PRs
paritytech/substrate#6564

@pscott
Copy link
Contributor Author

pscott commented Jul 6, 2020

Please add links between the PRs
paritytech/substrate#6564

Erf, sorry, this has changed recently I believe. This used to be [..] OR use the same name for your Polkadot branch as the substrate branch. My bad! :)

@tomaka
Copy link
Contributor

tomaka commented Jul 6, 2020

It's not only for the bot to work properly, but also for the sanity of the people looking at PRs.

@pscott pscott mentioned this pull request Jul 6, 2020
Merged
@ghost
Copy link

ghost commented Jul 8, 2020

bot merge

@ghost
Copy link

ghost commented Jul 8, 2020

Failed a required check; merge cancelled.

@tomaka
Copy link
Contributor

tomaka commented Jul 8, 2020

There seems to be a legitimate test failure.

https://gitlab.parity.io/parity/polkadot/-/jobs/584397#L364

thread 'main' panicked at 'Non-unique argument name: log-directory is already in use', /usr/local/cargo/registry/src/gitproxy.zycloud.tk-1ecc6299db9ec823/clap-2.33.1/src/app/parser.rs:181:9

@pscott
Copy link
Contributor Author

pscott commented Jul 8, 2020

There seems to be a legitimate test failure.

https://gitlab.parity.io/parity/polkadot/-/jobs/584397#L364

thread 'main' panicked at 'Non-unique argument name: log-directory is already in use', /usr/local/cargo/registry/src/gitproxy.zycloud.tk-1ecc6299db9ec823/clap-2.33.1/src/app/parser.rs:181:9

Yup working on it! :)

@tomaka tomaka merged commit 8d9bc11 into master Jul 8, 2020
@tomaka tomaka deleted the scott_log_rotation branch July 8, 2020 12:05
ordian pushed a commit that referenced this pull request Jul 9, 2020
Merge branch 'master' into ao-overseer-all-messages-integration
b5e49b0 
* master:
  Implement PoV Distribution Subsystem (#1344)
  Bump Substrate (#1382)
  Update the Kusama bootnode IDs (#1377)
  Companion for #6575 (Add `WeightInfo`) (#1352)
  Companion for #6599 (#1371)
  Use `SpawnNamed` to give tasks names (#1379)
  Update to substrate#59ee76a0 (#1380)
  Companion PR for #6564 (#1350)
  Companion for #6584 (#1373)
  Companion for #6500 (decl_module: frame_system as default ident) (#1314)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@rphmeier rphmeier rphmeier approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@pscott pscott

Labels

A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@pscott @parity-cla-bot @tomaka @rphmeier