Merge pull request #9147 from pravisankar/add-plugin-to-clusternetwork

Merged by openshift-bot
openshift · Jun 16, 2016 · da4eb9c · da4eb9c
2 parents 5493ff6 + e4ef036
commit da4eb9c
Show file tree

Hide file tree

Showing 26 changed files with 226 additions and 145 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/common.go b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/common.go
diff --git a/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/factory/factory.go b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/factory/factory.go
diff --git a/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/ovs/plugin.go b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/ovs/plugin.go
diff --git a/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/ovs/proxy.go b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/plugins/osdn/ovs/proxy.go