Skip to content

Merge main #1261

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

Merged
merged 8 commits into from
Dec 8, 2023
Merged

Merge main #1261

merged 8 commits into from
Dec 8, 2023

Conversation

quzard
Copy link
Collaborator

@quzard quzard commented Dec 8, 2023

No description provided.

quzard and others added 8 commits December 7, 2023 11:38
# Conflicts:
#	core/config/Config.h
#	core/processor/ProcessorParseApsaraNative.cpp
#	core/unittest/processor/ProcessorDesensitizeNativeUnittest.cpp
#	core/unittest/processor/ProcessorFilterNativeUnittest.cpp
#	core/unittest/processor/ProcessorParseApsaraNativeUnittest.cpp
#	core/unittest/processor/ProcessorParseDelimiterNativeUnittest.cpp
#	core/unittest/processor/ProcessorParseJsonNativeUnittest.cpp
@CLAassistant
Copy link

CLAassistant commented Dec 8, 2023

CLA assistant check
All committers have signed the CLA.

@henryzhx8 henryzhx8 merged commit aa436b9 into alibaba:feat/pipeline Dec 8, 2023
@quzard quzard deleted the mergeMain branch February 28, 2024 02:28
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