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

Sync code into dev #336

Merged
merged 35 commits into from
Jul 8, 2019
Merged

Sync code into dev #336

merged 35 commits into from
Jul 8, 2019

Conversation

bxq2011hust
Copy link
Member

No description provided.

fqliao and others added 30 commits May 30, 2019 10:00
  remove static nodeToBlockNumberMap & modify error code
modify BCOS_VERSION from private to public
…-2.0.0-rc3

Revert "Revert "Release 2.0.0 rc3""
update version in file release_node.txt
merge release-2.0.4 to master
@bxq2011hust bxq2011hust requested review from ywy2090 and fqliao and removed request for ywy2090 July 8, 2019 09:15
@ghost
Copy link

ghost commented Jul 8, 2019

PMD detected 8 issues on bfc983b
Visit https://sider.review/gh/repos/113938008/pulls/336 to review the issues.

posted by Sider

@bxq2011hust bxq2011hust merged commit 4f4b25b into FISCO-BCOS:dev Jul 8, 2019
ywy2090 pushed a commit that referenced this pull request Jan 27, 2021
* Revert "Release 2.0.0 rc3"

* Revert "Revert "Release 2.0.0 rc3""

* make receipt error more friendly and format code

* update version in file release_node.txt

* update version in filerelease_node.txt (#318)

* update .travis.yml

* add guomi TableTest test class

* remove useless file

* update .gitignore

* remove useless test

* move guomi TableTest

* remove password parameter for some method for P12Manager

* add create(ECKeyPair keyPair) for GenCredential

* fix codacy

* rename CRUDSerivce to CRUDService

* add indexed parameters for event.

* fix codacy

* update travis ci

* fix conficts

* fix conficts

* fix conficts

* fix ut

* update ChangeLog and web3sdk version.
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.

5 participants