Merge branch 'master' into hapool

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
 	}
 

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/

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

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/

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
 }
+*/