Skip to content

Commit 9c9072a

Browse files
dseevrdseevr
authored
Merge pull request contiv#69 from dseevr/update_godeps
Godeps,contivModel.go: update import path for objdb to reflect new netplugin location
2 parents 4b868c1 + 8ff8138 commit 9c9072a

File tree

18 files changed

+33
-85
lines changed

18 files changed

+33
-85
lines changed

‎Godeps/Godeps.json

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contivModel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"encoding/json"
99
"errors"
1010
log "github.com/Sirupsen/logrus"
11-
"github.com/contiv/objdb/modeldb"
11+
"github.com/contiv/netplugin/objdb/modeldb"
1212
"github.com/gorilla/mux"
1313
"net/http"
1414
"regexp"

‎vendor/github.com/contiv/netplugin/LICENSE

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/contiv/objdb/.gitignore renamed to ‎vendor/github.com/contiv/netplugin/objdb/.gitignore

File renamed without changes.

‎vendor/github.com/contiv/netplugin/objdb/LICENSE

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/contiv/objdb/Makefile renamed to ‎vendor/github.com/contiv/netplugin/objdb/Makefile

File renamed without changes.

‎vendor/github.com/contiv/objdb/README.md renamed to ‎vendor/github.com/contiv/netplugin/objdb/README.md

File renamed without changes.

‎vendor/github.com/contiv/objdb/Vagrantfile renamed to ‎vendor/github.com/contiv/netplugin/objdb/Vagrantfile

File renamed without changes.

‎vendor/github.com/contiv/objdb/client.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/client.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/consulClient.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/consulClient.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/consulLock.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/consulLock.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/consulService.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/consulService.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/etcdClient.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/etcdClient.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/contiv/objdb/etcdLock.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/etcdLock.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/etcdService.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/etcdService.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/modeldb/modeldb.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/modeldb/modeldb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/contiv/objdb/objdb.go renamed to ‎vendor/github.com/contiv/netplugin/objdb/objdb.go

File renamed without changes.

‎vendor/github.com/contiv/objdb/checks.sh

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)