Skip to content
This repository has been archived by the owner on Dec 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request #154 from sylabs/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
pisarukv authored Jun 17, 2019
2 parents 6ad0fef + ff842fb commit 38c273c
Show file tree
Hide file tree
Showing 109 changed files with 6,986 additions and 6,509 deletions.
50 changes: 18 additions & 32 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,6 @@ required = [
branch = "master" #osdk_branch_annotation
# version = "=v0.5.0" #osdk_version_annotation

[[constraint]]
branch = "master"
name = "k8s.io/apimachinery"

[[constraint]]
name = "k8s.io/client-go"
version = "10.0.0"

[[override]]
name = "github.com/gorilla/mux"
version = "1.7.0"

[[override]]
name = "github.com/pkg/errors"
version = "0.8.1"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ clean:

.PHONY: test
test:
$(V)go test -v ./...
$(V)go test -v -coverprofile=cover.out -race ./...

.PHONY: lint
lint:
Expand Down
Loading

0 comments on commit 38c273c

Please sign in to comment.