mirror
/
ledisdb
mirror of https://github.com/ledisdb/ledisdb.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
siddontang 2014-08-11 10:10:32 +08:00
parent cd14eaa879 693bcf32f4
commit 872eb99a27
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,4 +2,5 @@ build
*.pyc
.DS_Store
nohup.out
build_config.mk
build_config.mk
var/

2
bootstrap.sh
View File

@ -11,7 +11,7 @@ go get github.com/szferi/gomdb
go get github.com/boltdb/bolt
go get gopkg.in/mgo.v2/bson
go get github.com/ugorji/go/codec
go get github.com/BurntSushi/toml
go get github.com/siddontang/go-bson/bson

2
server/client_http.go
View File

@ -10,8 +10,8 @@ import (
"strings"
"encoding/json"
"github.com/siddontang/go-bson/bson"
"github.com/ugorji/go/codec"
"gopkg.in/mgo.v2/bson"
)
var allowedContentTypes = map[string]struct{}{