This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-java.git
commit 76e3988c01d522d9d10467793b0ebb6b949a2a92 Merge: b3129d0 ebae8c3 Author: Lee Rhodes <[email protected]> AuthorDate: Tue Jun 11 15:50:54 2019 -0700 Merge branch 'master' of [email protected]:apache/incubator-datasketches-java.git pom.xml | 2 +- .../theta/ConcurrentDirectQuickSelectSketch.java | 14 ++-- .../theta/ConcurrentHeapQuickSelectSketch.java | 17 +++-- src/main/java/com/yahoo/sketches/theta/Sketch.java | 3 +- .../java/com/yahoo/sketches/theta/UnionImpl.java | 79 +++++++++++++--------- .../yahoo/sketches/theta/UpdateSketchBuilder.java | 57 ++++++++++------ .../ConcurrentDirectQuickSelectSketchTest.java | 9 +++ .../com/yahoo/sketches/theta/DirectUnionTest.java | 26 +++++++ 8 files changed, 139 insertions(+), 68 deletions(-) diff --cc pom.xml index b692605,83d0916..93a007f --- a/pom.xml +++ b/pom.xml @@@ -21,10 -6,10 +21,10 @@@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.yahoo.datasketches</groupId> - <artifactId>sketches-core</artifactId> + <groupId>org.apache.datasketches</groupId> + <artifactId>datasketches-java</artifactId> <packaging>jar</packaging> <!-- jar is the default --> - <version>0.13.4-SNAPSHOT</version> + <version>0.13.5-SNAPSHOT</version> <name>${project.groupId}:${project.artifactId}</name> <description>Core sketch algorithms used alone and by other repositories in the DataSketches library.</description> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
