From ed298bdf669422ed0edadfa98d84a89e731e8ed3 Mon Sep 17 00:00:00 2001 From: holys Date: Fri, 8 Aug 2014 09:12:28 +0800 Subject: [PATCH 1/2] update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 49a172d..c6ac2ca 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ build *.pyc .DS_Store nohup.out -build_config.mk \ No newline at end of file +build_config.mk +var/ From 693bcf32f479740aec887d1cd95df78bb007e3c2 Mon Sep 17 00:00:00 2001 From: wenyekui Date: Mon, 11 Aug 2014 10:08:41 +0800 Subject: [PATCH 2/2] change import path of bson lib --- bootstrap.sh | 2 +- server/client_http.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 2569987..ee260b7 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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 diff --git a/server/client_http.go b/server/client_http.go index 9a4057b..6707e24 100644 --- a/server/client_http.go +++ b/server/client_http.go @@ -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{}{