Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix duplicate getLshwValues definition #560

Merged
merged 2 commits into from
Jun 23, 2017
Merged

Fix duplicate getLshwValues definition #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6df28c
fix getLshwValues duplicate breaking build
byxorna Jun 22, 2017
2c9ba92
make sure to run scala tests
byxorna Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions app/collins/models/AssetMeta.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}