uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-21 15:18:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into shared_balances

Browse Source 
Conflicts:
	apier/v1/apier_local_test.go
	apier/v1/tutfscsv_local_test.go
	cmd/cgr-engine/cgr-engine.go
	engine/storage_map.go
	engine/storage_mongo.go
	engine/storage_redis.go
This commit is contained in:
Radu Ioan Fericean
2014-01-27 11:18:25 +02:00
parent b735688fe5 6a251c2b2c
commit 69cf1cc896
41 changed files with 602 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/storage_sql.go
View File

@@ -1129,7 +1129,7 @@ func (self *SQLStorage) GetTpAccountActions(aaFltr *utils.TPAccountActions) (map
Tenant: tenant,
Account: account,
Direction: direction,
ActionPlanId: action_timings_tag,
ActionPlanId: action_timings_tag,
ActionTriggersId: action_triggers_tag,
}
aa[aacts.KeyId()] = aacts