Skip to content

Commit

Permalink
fix conflicts for develop and cloudevents branch (#637)
Browse files Browse the repository at this point in the history
* Add files via upload

* Update README.md

* [ISSUE #580] Add checkstyle gradle plugin (#581)

* Add checkstyle gradle plugin, change plugin package

* skip check in ci

* update wechat-official qr code

* update mesh-helper qr code

* Add files via upload

* update README.md

* update README.md

* Update .asf.yaml

* [ISSUE #588] Fix typo in README.md (#589)

close #588

* [Bug #590] Consumer subscription topic is invalid (#590) (#592)

* [Bug #590] Consumer subscription topic is invalid (#590)

* [Bug #590] Consumer subscription topic is invalid (#590)

close #590

* fixed a wrong url in cn-doc (#585)

close #596

* resolve_exception->Consumer subscription topic is invalid #590 (#598)

close #590

* Update eventmesh-store-quickstart.md

* Update README.md

* Add slack icon (#601)

* eventmesh-admin-rocketmq submodule and createTopic REST API (#530)

* eventmesh-admin-rocketmq submodule and createTopic draft API

* add license header

* change to /topicmanage

* fix build error

* fix some code check style issues

close #435 #346

* create topic command (#531)

* create topic command

* address review comments

* fix build and add createtopic method to standalone module

* fix build issue

* fix a few remaining code check issues

* fix test

close #346

* Update README.md

* Safely delete useless log4j dependencies

* Safely delete outdated metrics dependencies

* Sately delete useless collections4 dependency

* Safely delete useless commons dependencies

* Reback to the collections4, but let it not in api dependency

* Could not remove text for Safe Ramdom implementation

* Fix build error

* Add collection4

* Fix build error

* Revert "Safely delete outdated metrics dependencies"

This reverts commit 92287b0.

* Change to api dependency

* Remove doclint warnings

* Depracated checkstyle check error temporarily, we should remove it when we polish later

* Update .asf.yaml

* Update .asf.yaml

Co-authored-by: Eason Chen <qqeasonchen@gmail.com>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: Nicholas Zhan <zhan_nicholas@outlook.com>
Co-authored-by: hagsyn <44764414+hagsyn@users.noreply.github.com>
Co-authored-by: sarihuangshanrong <280456134@qq.com>
Co-authored-by: yuri <yu.zhao5@huawei.com>
Co-authored-by: vongosling <vongosling@apache.org>
  • Loading branch information
8 people authored Dec 8, 2021
1 parent 8ea15f6 commit 39ddd0a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 39ddd0a

Please sign in to comment.