Skip to content

[ISSUE 57] add rocketmq api - #63

Open
linjiemiao wants to merge 4 commits into
apache:masterfrom
silotrd:issue-57-dev
Open

[ISSUE 57] add rocketmq api#63
linjiemiao wants to merge 4 commits into
apache:masterfrom
silotrd:issue-57-dev

Conversation

@linjiemiao

Copy link
Copy Markdown

add rocketmq api

@liuruiyiyang

Copy link
Copy Markdown
Contributor

@linjiemiao ping, could you please help to resolve the conflict.

@linjiemiao

Copy link
Copy Markdown
Author

@linjiemiao ping, could you please help to resolve the conflict.

Okay, I will cherry-pick your latest commit, and then I resolve the conflict.

liuruiyiyang and others added 3 commits September 28, 2020 16:07
* feat(console): add CRD for RocketMQ Console

* chore(*): add ASF header

Co-authored-by: liuruiyiyang <liurui@apache.org>
@drivebyer

Copy link
Copy Markdown
Contributor

still need this

@RockteMQ-AI

Copy link
Copy Markdown

⚠️ Merge conflict detected

This PR has conflicts with the base branch and cannot be merged. Please rebase or merge the base branch into your branch and resolve the conflicts:

git fetch origin
git checkout issue-57-dev
git rebase origin/main
# resolve conflicts, then:
git push --force-with-lease

This is a one-time reminder. Feel free to @mention me for a re-review after conflicts are resolved.


Automated notification by github-manager-bot

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.

4 participants