Skip to content
This repository has been archived by the owner on Nov 18, 2021. It is now read-only.

Merge twitter's master (0.6-T5) back onto fork of 0.8 #28

Open
jakemannix opened this issue Jul 11, 2013 · 0 comments
Open

Merge twitter's master (0.6-T5) back onto fork of 0.8 #28

jakemannix opened this issue Jul 11, 2013 · 0 comments
Assignees

Comments

@jakemannix
Copy link

Current target branch: 0.8_merge_0.6-T5

Status:

to merge:

diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0DocInferenceMapper.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0Driver.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0Driver.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0PriorMapper.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVB0PriorMapper.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVBConfig.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CVBConfig.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0Mapper.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/CachingCVB0PerplexityMapper.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/InMemoryCollapsedVariationalBayes0.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/InMemoryCollapsedVariationalBayes0.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/PriorTrainingReducer.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/PriorTrainingReducer.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModel.java
diff --git a/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModelUtils.java b/core/src/main/java/org/apache/mahout/clustering/lda/cvb/TopicModelUtils.java
diff --git a/core/src/test/java/org/apache/mahout/clustering/lda/cvb/TestCVBModelTrainer.java b/core/src/test/java/org/apache/mahout/clustering/lda/cvb/TestCVBModelTrainer.java
diff --git a/core/src/test/java/org/apache/mahout/clustering/lda/cvb/TestTopicModelUtils.java b/core/src/test/java/org/apache/mahout/clustering/lda/cvb/TestTopicModelUtils.java

not scheduled to merge:

diff --git a/.gitignore b/.gitignore
diff --git a/bin/mahout b/bin/mahout
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
diff --git a/core/pom.xml b/core/pom.xml
diff --git a/distribution/pom.xml b/distribution/pom.xml
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
diff --git a/examples/pom.xml b/examples/pom.xml
diff --git a/integration/pom.xml b/integration/pom.xml
diff --git a/math/pom.xml b/math/pom.xml
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/ruby/mahout_console.rb b/src/main/ruby/mahout_console.rb

already merged onto branch: 0.8_merge_0.6-T5

diff --git a/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java b/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
diff --git a/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java b/integration/src/main/java/org/apache/mahout/utils/vectors/VectorHelper.java
diff --git a/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java b/integration/src/test/java/org/apache/mahout/utils/vectors/VectorHelperTest.java
diff --git a/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java b/math/src/main/java/org/apache/mahout/math/SequentialAccessSparseVector.java
diff --git a/core/src/main/java/org/apache/mahout/common/MemoryUtil.java b/core/src/main/java/org/apache/mahout/common/MemoryUtil.java

@ghost ghost assigned jakemannix Jul 11, 2013
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant