Merge pull request #560 from byxorna/gabe-559

Fix duplicate getLshwValues definition
tumblr · Jun 23, 2017 · 367d8a0 · 367d8a0
2 parents 35dc51e + 2c9ba92
commit 367d8a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,9 @@ env:
   - RUN_SCALA=true RUN_RUBY=false
 matrix:
   include:
+    # make sure we run the scala builds
+    - jdk: oraclejdk7
+      env: RUN_RUBY=false RUN_SCALA=true
     - jdk: oraclejdk7
       env: RUN_RUBY=true RUN_SCALA=false GEM_NAME=collins-client
     - jdk: oraclejdk7

diff --git a/app/collins/models/AssetMeta.scala b/app/collins/models/AssetMeta.scala
@@ -216,9 +216,5 @@ object AssetMeta extends Schema with AnormAdapter[AssetMeta] with AssetMetaKeys
     def getLshwValues(): Set[AssetMeta] = {
       Set(BaseDescription, BaseProduct, BaseVendor, BaseSerial, GpuProduct, GpuVendor)
     }
-
-    def getLshwValues(): Set[AssetMeta] = {
-      Set(BaseDescription, BaseProduct, BaseVendor, BaseSerial)
-    }
   }
 }