From 8e8463a99fb5797764c9039806848670952491da Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Mon, 21 Dec 2015 12:43:45 +0200 Subject: [PATCH 1/2] mongo map key cleanup no longer needed --- engine/storage_mongo.go | 1 - utils/map.go | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/storage_mongo.go b/engine/storage_mongo.go index e2b6d2a80..3d71fa4ec 100644 --- a/engine/storage_mongo.go +++ b/engine/storage_mongo.go @@ -1158,7 +1158,6 @@ func (ms *MongoStorage) GetAllActionPlans() (ats map[string]*ActionPlan, err err ats = make(map[string]*ActionPlan, len(apls)) for key, value := range apls { apl := value.(*ActionPlan) - apl.AccountIDs = utils.YesDots(apl.AccountIDs) ats[key] = apl } diff --git a/utils/map.go b/utils/map.go index 90bce4cd4..6fa89fe0f 100644 --- a/utils/map.go +++ b/utils/map.go @@ -144,6 +144,7 @@ func (sm StringMap) GetOne() string { return "" } +/* func NoDots(m map[string]struct{}) map[string]struct{} { return MapKeysReplace(m, ".", ".") } @@ -160,3 +161,4 @@ func MapKeysReplace(m map[string]struct{}, old, new string) map[string]struct{} } return m } +*/ From d627f0e24029ac45727eaf86391dd59d5847f61e Mon Sep 17 00:00:00 2001 From: rinor Date: Mon, 21 Dec 2015 12:35:47 +0100 Subject: [PATCH 2/2] packages: glide - "glide up" to "glide install" --- packages/jessie/rules | 2 +- packages/redhat_fedora/cgrates.spec | 2 +- packages/squeeze/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/jessie/rules b/packages/jessie/rules index 33646362d..5d4352fbc 100755 --- a/packages/jessie/rules +++ b/packages/jessie/rules @@ -25,7 +25,7 @@ binary-arch: clean mkdir -p src/github.com/cgrates ln -sf $(CURDIR) src/github.com/cgrates go get -v github.com/Masterminds/glide - $(GOPATH)/bin/glide up + $(GOPATH)/bin/glide install exec $(CURDIR)/build.sh mkdir -p $(PKGDIR)/usr/bin cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/ diff --git a/packages/redhat_fedora/cgrates.spec b/packages/redhat_fedora/cgrates.spec index c10ef1d05..9ca2a61b9 100644 --- a/packages/redhat_fedora/cgrates.spec +++ b/packages/redhat_fedora/cgrates.spec @@ -68,7 +68,7 @@ export GO15VENDOREXPERIMENT=1 export GOPATH=$RPM_BUILD_DIR/%{name}-%{version} cd $RPM_BUILD_DIR/%{name}-%{version}/src/github.com/cgrates/cgrates go get -v github.com/Masterminds/glide -$GOPATH/bin/glide up +$GOPATH/bin/glide install ./build.sh %install diff --git a/packages/squeeze/rules b/packages/squeeze/rules index 745308151..b813db9c6 100755 --- a/packages/squeeze/rules +++ b/packages/squeeze/rules @@ -25,7 +25,7 @@ binary-arch: clean mkdir -p src/github.com/cgrates ln -sf $(CURDIR) src/github.com/cgrates go get -v github.com/Masterminds/glide - $(GOPATH)/bin/glide up + $(GOPATH)/bin/glide install exec $(CURDIR)/build.sh mkdir -p $(PKGDIR)/usr/bin cp $(GOPATH)/bin/cgr-* $(PKGDIR)/usr/bin/