diff --git a/.travis.yml b/.travis.yml index f111846f8..50773e948 100644 --- 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 index c5a4e3921..8ccd6921e 100644 --- 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) - } } }