Skip to content

Commit

Permalink
Fix, import path to CodisLabs
Browse files Browse the repository at this point in the history
  • Loading branch information
spinlock committed Jan 17, 2016
1 parent 034ba40 commit 8a860df
Show file tree
Hide file tree
Showing 75 changed files with 212 additions and 210 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: go

go:
- 1.4.3
- 1.5.1
- 1.5.2
- 1.5.3

install:
- go get -u github.com/tools/godep
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get clean
RUN rm -rf /var/lib/apt/lists/*

ENV GOPATH /gopath
ENV CODIS ${GOPATH}/src/github.com/wandoulabs/codis
ENV CODIS ${GOPATH}/src/github.com/CodisLabs/codis
ENV PATH ${GOPATH}/bin:${PATH}:${CODIS}/bin
COPY . ${CODIS}

Expand Down
4 changes: 2 additions & 2 deletions Godeps/Godeps.json

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

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#Codis - Redis cluster solution supporting pipeline and scaling dynamically

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/wandoulabs/codis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://travis-ci.org/wandoulabs/codis.svg)](https://travis-ci.org/wandoulabs/codis)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CodisLabs/codis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://travis-ci.org/CodisLabs/codis.svg)](https://travis-ci.org/CodisLabs/codis)

Codis is a proxy based high performance Redis cluster solution written in Go. It is production-ready and widely used at [wandoujia.com](http://wandoujia.com) and many companies. You can see [Codis Releases](https://github.com/wandoulabs/codis/releases) for latest and most stable realeases.
Codis is a proxy based high performance Redis cluster solution written in Go. It is production-ready and widely used at [wandoujia.com](http://wandoujia.com) and many companies. You can see [Codis Releases](https://github.com/CodisLabs/codis/releases) for latest and most stable realeases.

##Compared with Twemproxy and Redis Cluster
<table>
Expand Down
10 changes: 5 additions & 5 deletions cmd/admin/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"path/filepath"
"time"

"github.com/wandoulabs/codis/pkg/models"
"github.com/wandoulabs/codis/pkg/models/etcd"
"github.com/wandoulabs/codis/pkg/models/zk"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/models"
"github.com/CodisLabs/codis/pkg/models/etcd"
"github.com/CodisLabs/codis/pkg/models/zk"
"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/log"
)

type cmdAdmin struct {
Expand Down
10 changes: 5 additions & 5 deletions cmd/admin/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"io/ioutil"
"strconv"

"github.com/wandoulabs/codis/pkg/models"
"github.com/wandoulabs/codis/pkg/proxy"
"github.com/wandoulabs/codis/pkg/topom"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/models"
"github.com/CodisLabs/codis/pkg/proxy"
"github.com/CodisLabs/codis/pkg/topom"
"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/log"
)

type cmdDashboard struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/admin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package main
import (
"github.com/docopt/docopt-go"

"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/utils/log"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/admin/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"fmt"
"io/ioutil"

"github.com/wandoulabs/codis/pkg/models"
"github.com/wandoulabs/codis/pkg/proxy"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/models"
"github.com/CodisLabs/codis/pkg/proxy"
"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/log"
)

type cmdProxy struct {
Expand Down
12 changes: 6 additions & 6 deletions cmd/dashboard/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (

"github.com/docopt/docopt-go"

"github.com/wandoulabs/codis/pkg/models"
"github.com/wandoulabs/codis/pkg/models/etcd"
"github.com/wandoulabs/codis/pkg/models/zk"
"github.com/wandoulabs/codis/pkg/topom"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/models"
"github.com/CodisLabs/codis/pkg/models/etcd"
"github.com/CodisLabs/codis/pkg/models/zk"
"github.com/CodisLabs/codis/pkg/topom"
"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/log"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/angular-ui-bootstrap/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/angular/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/bootstrap-dialog/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/bootstrap/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/convert-hex/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/convert-string/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/highcharts-ng/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/highcharts/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/jquery/package.json

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

4 changes: 2 additions & 2 deletions cmd/fe/assets/node_modules/sha256/package.json

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

11 changes: 6 additions & 5 deletions cmd/fe/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ import (
"github.com/docopt/docopt-go"
"github.com/go-martini/martini"
"github.com/martini-contrib/render"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/errors"
"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/wandoulabs/codis/pkg/utils/rpc"
"github.com/wandoulabs/codis/pkg/utils/sync2/atomic2"

"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/errors"
"github.com/CodisLabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/utils/rpc"
"github.com/CodisLabs/codis/pkg/utils/sync2/atomic2"
)

var roundTripper http.RoundTripper
Expand Down
7 changes: 4 additions & 3 deletions cmd/ha/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"time"

"github.com/docopt/docopt-go"
"github.com/wandoulabs/codis/pkg/topom"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/log"

"github.com/CodisLabs/codis/pkg/topom"
"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/log"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/proxy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (

"github.com/docopt/docopt-go"

"github.com/wandoulabs/codis/pkg/proxy"
"github.com/wandoulabs/codis/pkg/utils"
"github.com/wandoulabs/codis/pkg/utils/log"
"github.com/CodisLabs/codis/pkg/proxy"
"github.com/CodisLabs/codis/pkg/utils"
"github.com/CodisLabs/codis/pkg/utils/log"
)

func main() {
Expand Down
Loading

0 comments on commit 8a860df

Please sign in to comment.