pinot-contrib / pinot-docs

Apache Pinot Documentation
23 stars 156 forks source link

Large changes on routing.md #134

Closed gortiz closed 1 year ago

gortiz commented 1 year ago

As part of the documentation day, I rewrote most of the routing document in order to make it easier to understand the difference between different routing optimizations

gortiz commented 1 year ago

This is a lot of text and I would like to do a second read before merging it

Jackie-Jiang commented 1 year ago

There are some conflicts with the base branch. Can you resolve that so that we can merge the change

gortiz commented 1 year ago

There are some conflicts with the base branch. Can you resolve that so that we can merge the change

I think I solved them before you commented that. Maybe we had a race condition there ^_^. Commit 6f32ae0 should be mergeable without problems.

Jackie-Jiang commented 1 year ago

@gortiz It still doesn't allow me to merge. Can you try rebase again and force push this branch?

Screenshot 2023-03-22 at 9 59 27 AM