(NOJIRA) change package of Hadoop1HDFSUtil and associated classes in …

…h2o to avoid conflict with spark classes
davidtmiller · Apr 11, 2015 · 8439846 · 8439846
1 parent fb30375
commit 8439846
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...rg/apache/mahout/common/DrmMetadata.scala → ...pache/mahout/h2o/common/DrmMetadata.scala b/...rg/apache/mahout/common/DrmMetadata.scala → ...pache/mahout/h2o/common/DrmMetadata.scala
@@ -1,4 +1,4 @@
-package org.apache.mahout.common
+package org.apache.mahout.h2o.common
 
 import scala.reflect.ClassTag
 import org.apache.hadoop.io._

diff --git a/...a/org/apache/mahout/common/HDFSUtil.scala → ...g/apache/mahout/h2o/common/HDFSUtil.scala b/...a/org/apache/mahout/common/HDFSUtil.scala → ...g/apache/mahout/h2o/common/HDFSUtil.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.mahout.common
+package org.apache.mahout.h2o.common
 
 /** High level Hadoop version-specific hdfs manipulations we need in context of our operations. */
 trait HDFSUtil {

diff --git a/...pache/mahout/common/Hadoop1HDFSUtil.scala → ...e/mahout/h2o/common/Hadoop1HDFSUtil.scala b/...pache/mahout/common/Hadoop1HDFSUtil.scala → ...e/mahout/h2o/common/Hadoop1HDFSUtil.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.mahout.common
+package org.apache.mahout.h2o.common
 
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.Path

diff --git a/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala b/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala
@@ -26,7 +26,7 @@ import org.apache.mahout.math.drm._
 import org.apache.mahout.math.drm.logical._
 import org.apache.mahout.h2obindings.ops._
 import org.apache.mahout.h2obindings.drm._
-import org.apache.mahout.common.{Hadoop1HDFSUtil, HDFSUtil}
+import org.apache.mahout.h2o.common.{Hadoop1HDFSUtil, HDFSUtil}
 
 /** H2O specific non-DRM operations */
 object H2OEngine extends DistributedEngine {