This is an automated email from the ASF dual-hosted git repository.

leerho pushed a commit to branch target_is_6.0.X
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git

commit 0a4d36960e4448f407eebe5cc70ce0c749e2c9aa
Merge: 8bab1daa 36b980aa
Author: Lee Rhodes <[email protected]>
AuthorDate: Tue Feb 18 12:13:20 2025 -0800

    Merge branch 'main' into target_is_6.0.X

 pom.xml                                            |  11 +-
 .../memory/DefaultMemoryRequestServer.java         | 110 +++++-
 .../org/apache/datasketches/memory/Memory.java     |  14 +-
 .../datasketches/memory/MemoryRequestServer.java   |  28 +-
 .../apache/datasketches/memory/MurmurHash3.java    | 196 ----------
 .../org/apache/datasketches/memory/Resource.java   |  55 ++-
 .../apache/datasketches/memory/WritableMemory.java |  40 +-
 .../memory/internal/MurmurHash3v4.java             | 386 -------------------
 .../datasketches/memory/internal/ResourceImpl.java |  26 +-
 .../memory/internal/WritableMemoryImpl.java        |  25 +-
 .../memory/internal/AllocateDirectMemoryTest.java  |  65 +++-
 .../memory/internal/DruidIssue11544Test.java       |  12 +-
 .../internal/ExampleMemoryRequestServerTest.java   |  16 +-
 .../memory/internal/MurmurHash3v3Test.java         | 419 ---------------------
 14 files changed, 294 insertions(+), 1109 deletions(-)

diff --cc pom.xml
index 7dba9622,f31639a5..94c6e513
--- a/pom.xml
+++ b/pom.xml
@@@ -25,16 -25,9 +25,9 @@@ under the License
  
    <modelVersion>4.0.0</modelVersion>
  
-   <!--
-   <parent>
-     <groupId>org.apache</groupId>
-     <artifactId>apache</artifactId>
-     <version>32</version>
-   </parent> -->
- 
    <groupId>org.apache.datasketches</groupId>
    <artifactId>datasketches-memory</artifactId>
 -  <version>6.1.0-SNAPSHOT</version>
 +  <version>6.0.0</version>
    <packaging>jar</packaging>
  
    <name>${project.artifactId}</name>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to