Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: create merge commit 0.12.0 #98

Merged
merged 331 commits into from
Mar 31, 2021
Merged

chore: create merge commit 0.12.0 #98

merged 331 commits into from
Mar 31, 2021

Conversation

brew0722
Copy link
Contributor

@brew0722 brew0722 commented Mar 31, 2021

Closes: #97

Description

This is the purpose of isolating 0.12.0 commits for 0.14.0-beta1.
There are no changes to the existing code.
It will be merged with a fast-forward merge.

Motivation and context

See the discussion in slack.

How has this been tested?

Checklist:

  • I followed the contributing guidelines.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.

webmaster128 and others added 30 commits September 22, 2020 12:04
Some improvements around the new custom errors
Let `impl Display for CanonicalAddr` use upper case hex
Create CustomQuery trait; Add QueryMsg::Chain to reflect
webmaster128 and others added 19 commits November 9, 2020 16:25
Show users how to properly set dependencies in migration guide
Show required imports along with available imports in the error message
This commit is for the changed the Migration PR merge policy.

* tag 'v0.12.0': (270 commits)
  Set version: 0.12.0
  Upgarde rust-optimizer to 0.10.5
  Set version: 0.12.0-alpha3
  Test BTreeSet::to_string_limited
  Explain why sorting is needed
  Pull out collection_to_string_limited and implement for vector
  Add compatibility table
  Make imports test independent of iterator feature
  Show all required imports in error message
  Cleanup error matching
  Use to_string_limited for features
  Implement LimitedDisplay for BTreeSet
  Add LimitedDisplay and implement for HashSet
  Remove StorageTransaction and friends
  Show users how to properly set dependencies in migration guide
  Address concerns from PR review
  Add helper so handler can call other handler
  Replace {Deps,DepsRef} with {Deps,DepsMut}
  Set version: 0.12.0-alpha2
  Allow constructing CacheOptions crate external
  ...

# Conflicts:
#	.circleci/config.yml
#	Cargo.lock
#	contracts/README.md
#	contracts/burner/Cargo.lock
#	contracts/burner/Cargo.toml
#	contracts/hackatom/Cargo.lock
#	contracts/hackatom/Cargo.toml
#	contracts/queue/Cargo.lock
#	contracts/queue/Cargo.toml
#	contracts/reflect/Cargo.lock
#	contracts/reflect/Cargo.toml
#	contracts/staking/Cargo.lock
#	contracts/staking/Cargo.toml
#	packages/schema/Cargo.toml
#	packages/std/Cargo.toml
#	packages/storage/Cargo.toml
#	packages/vm/Cargo.toml
#	packages/vm/src/testing/mock.rs
#	packages/vm/src/testing/mod.rs
@brew0722 brew0722 self-assigned this Mar 31, 2021
@brew0722 brew0722 mentioned this pull request Mar 31, 2021
3 tasks
@brew0722
Copy link
Contributor Author

github does not support ff-merge.
we can temporarily release the settings and push directly to develop,
However considering the pr history more importantly, we decide to leave 2 merge commits.

@brew0722 brew0722 merged commit 9795e6c into Finschia:develop Mar 31, 2021
@brew0722 brew0722 deleted the create_merge_commit_0.12.0 branch March 31, 2021 04:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adjustment according to migration PR merge policy change
6 participants