Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix_flaky_tests
Browse files Browse the repository at this point in the history
# Conflicts:
#	pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/creator/CLPForwardIndexCreatorV2Test.java
  • Loading branch information
bziobrowski committed Jan 17, 2025
2 parents 3b31c5f + 44b07b0 commit 92ead3c
Show file tree
Hide file tree
Showing 207 changed files with 6,262 additions and 4,117 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Pinot
Copyright 2018-2021 The Apache Software Foundation
Copyright 2018-2025 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Loading

0 comments on commit 92ead3c

Please sign in to comment.