summaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-08-23 21:33:55 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-08-23 21:33:55 +0900
commit67dcfd267d681012c2dcab7eaef657884e753a05 (patch)
tree7d987e303a54cf2a724fd4cd1acfb453b48e8c37 /server
parent52bd85beb9db537321df6760ba390bd6ce96a164 (diff)
zebra: merge gozebra
Seems that no good reason to have a separate repo for gozebra. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'server')
-rw-r--r--server/server.go2
-rw-r--r--server/zapi.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/server/server.go b/server/server.go
index b2279ba4..ed09f528 100644
--- a/server/server.go
+++ b/server/server.go
@@ -25,7 +25,7 @@ import (
"github.com/osrg/gobgp/packet"
"github.com/osrg/gobgp/policy"
"github.com/osrg/gobgp/table"
- zebra "github.com/osrg/gozebra"
+ "github.com/osrg/gobgp/zebra"
"net"
"os"
"strconv"
diff --git a/server/zapi.go b/server/zapi.go
index 4a239fec..7c1b9a42 100644
--- a/server/zapi.go
+++ b/server/zapi.go
@@ -18,7 +18,7 @@ package server
import (
"github.com/osrg/gobgp/packet"
"github.com/osrg/gobgp/table"
- zebra "github.com/osrg/gozebra"
+ "github.com/osrg/gobgp/zebra"
"net"
"strconv"
"strings"