From f0dcaa7f8484f91c984fa094c8cb87a4bd6da314 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 1 Mar 2016 16:43:56 +0800 Subject: [PATCH 1/3] remove couchbase dependence --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a6c9f84..3321424e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ install: - go get github.com/beego/x2j - go get github.com/beego/goyaml2 - go get github.com/belogik/goes - - go get github.com/couchbase/go-couchbase - go get github.com/siddontang/ledisdb/config - go get github.com/siddontang/ledisdb/ledis - go get golang.org/x/tools/cmd/vet From d81a768802356f9ca62efdd8af8d3289bebd5c8b Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 1 Mar 2016 16:54:37 +0800 Subject: [PATCH 2/3] change couchbase to beego/go-couchbase --- .travis.yml | 1 + session/couchbase/sess_couchbase.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3321424e..5b754b9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ install: - go get github.com/bradfitz/gomemcache/memcache - go get github.com/garyburd/redigo/redis - go get github.com/beego/x2j + - go get github.com/beego/go-couchbase - go get github.com/beego/goyaml2 - go get github.com/belogik/goes - go get github.com/siddontang/ledisdb/config diff --git a/session/couchbase/sess_couchbase.go b/session/couchbase/sess_couchbase.go index d5be11d0..2cf14454 100644 --- a/session/couchbase/sess_couchbase.go +++ b/session/couchbase/sess_couchbase.go @@ -37,7 +37,7 @@ import ( "strings" "sync" - couchbase "github.com/couchbase/go-couchbase" + couchbase "github.com/beego/go-couchbase" "github.com/astaxie/beego/session" ) From 36e31609043ff0971896792b3721ae79759423c8 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 1 Mar 2016 21:41:44 +0800 Subject: [PATCH 3/3] add go1.6.0 and remove 1.3.3 --- .travis.yml | 4 ++-- session/couchbase/sess_couchbase.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b754b9c..380eca81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: go go: - tip + - 1.6.0 - 1.5.3 - 1.4.3 - - 1.3.3 services: - redis-server - mysql @@ -21,7 +21,7 @@ install: - go get github.com/bradfitz/gomemcache/memcache - go get github.com/garyburd/redigo/redis - go get github.com/beego/x2j - - go get github.com/beego/go-couchbase + - go get github.com/couchbase/go-couchbase - go get github.com/beego/goyaml2 - go get github.com/belogik/goes - go get github.com/siddontang/ledisdb/config diff --git a/session/couchbase/sess_couchbase.go b/session/couchbase/sess_couchbase.go index 2cf14454..d5be11d0 100644 --- a/session/couchbase/sess_couchbase.go +++ b/session/couchbase/sess_couchbase.go @@ -37,7 +37,7 @@ import ( "strings" "sync" - couchbase "github.com/beego/go-couchbase" + couchbase "github.com/couchbase/go-couchbase" "github.com/astaxie/beego/session" )