Conversation
oscerd
left a comment
There was a problem hiding this comment.
I'll start the review tomorrow. Thanks
components/camel-grok/src/test/resources/org/apache/camel/component/grok/data/access_log
Outdated
Show resolved
Hide resolved
onderson
left a comment
There was a problem hiding this comment.
LGTM except minor comments. Thanks for contribution
|
I have one small update of javadoc and adoc. I will push it in few minutes. |
|
There is merge conflict now, and also you have some version number changes in parent/pom which goes backwards, please revert these. |
|
@davsclaus do we want to bring this is for M3? I think it makes sense to wait for M3 RC and then merge this new Dataformat |
|
I have merged actual master and fixed bad merge of parent/pom.xml |
components/camel-grok/src/main/java/org/apache/camel/component/grok/GrokDataFormat.java
Show resolved
Hide resolved
|
Okay can we resolve the merge conflict. We want to only merge if we can do it on top of master, eg "This branch cannot be rebased due to conflicts" |
|
I have squashed the commits, now this should be able to rebase. |
|
I think this LGTM and we can get this merged |
|
I'll merge this today |
|
This has been merged on master, thanks a lot @bedlaj |
Todos: