Commit Graph

5785 Commits

Author SHA1 Message Date
TeoV
e2d9f3a73e Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-10 16:55:33 +03:00
TeoV
965e476c7c Add test for TPUser and disable stats from tutmysql tutmongo and tutpostgres 2017-09-10 16:54:38 +03:00
DanB
239306aa1b Moved stats files in engine 2017-09-08 20:44:02 +02:00
DanB
c4a76eec94 Merge fixes 2017-09-08 20:43:13 +02:00
DanB
9ea9ec65d9 Refactoring stats, disabled for now in sources 2017-09-08 19:40:09 +02:00
Dan Christian Bogos
abe74d0234 Merge pull request #726 from Edwardro22/master
Rename the badly named files
2017-09-08 12:36:34 +02:00
edwardro22
191f1a3c73 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-08 10:35:06 +00:00
edwardro22
7f14b3c1cc Rename the badly named files 2017-09-08 10:32:26 +00:00
Dan Christian Bogos
bd20c9edf6 Merge pull request #725 from Edwardro22/master
Small fix
2017-09-07 18:38:19 +02:00
edwardro22
e2558ad8b6 Typo 2017-09-07 16:36:44 +00:00
edwardro22
75abc320cf Fixed small typo 2017-09-07 16:29:45 +00:00
edwardro22
eb9e282969 Small fix 2017-09-07 16:19:54 +00:00
Dan Christian Bogos
a407647358 Merge pull request #724 from Edwardro22/master
Fixed migrator and versions
2017-09-07 18:15:03 +02:00
edwardro22
41bc52ca97 Removed logs 2017-09-07 15:35:52 +00:00
edwardro22
cf61dbd5dc Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-07 15:24:52 +00:00
edwardro22
b76cede416 Small fix 2017-09-07 15:23:48 +00:00
edwardro22
6ff6515510 Small fix 2017-09-07 15:11:44 +00:00
Dan Christian Bogos
e52626a9e7 Merge pull request #723 from TeoV/master
Rename StatsConfig -> StatQueueProfile
2017-09-07 17:08:31 +02:00
edwardro22
4b7165405d Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/libtest.go
2017-09-07 15:06:16 +00:00
edwardro22
2c7d27745c Versioning fix 2017-09-07 15:00:18 +00:00
TeoV
f97ed47e52 Small fix for rename 2017-09-07 10:17:12 -04:00
TeoV
aeb96949aa Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-07 10:05:43 -04:00
TeoV
76427bbb51 Rename StatsConfig -> StatQueueProfile 2017-09-07 10:02:49 -04:00
Dan Christian Bogos
8e0945cff4 Merge pull request #722 from TeoV/master
Merge LoadRatingCache and LoadAccountingCache into LoadDataDBCache
2017-09-07 12:34:06 +02:00
DanB
47c8a522e3 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-07 11:53:39 +02:00
DanB
5108e88e42 ResourceS - moving short cache to general cache 2017-09-07 11:53:31 +02:00
TeoV
0c33a4480c Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-07 05:45:30 -04:00
TeoV
02d9b539bd Merge LoadRatingCache and LoadAccountingCache into LoadDataDBCache 2017-09-07 05:43:33 -04:00
Dan Christian Bogos
980d801ecd Merge pull request #721 from timenet-it/master
Correct wrong link on Debian link
2017-09-07 09:52:35 +02:00
paolovisintin
fd06df529d Added contributor 2017-09-07 09:50:48 +02:00
paolovisintin
bc4bed1690 Correct wrong link on Debian link 2017-09-07 09:29:51 +02:00
edwardro22
411b049591 Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/onstor_it_test.go
	engine/storage_map.go
	engine/storage_mongo_datadb.go
	engine/storage_redis.go
	engine/version.go
2017-09-06 23:02:08 +00:00
edwardro22
4cd54e9ab7 Refactored versions and added tests 2017-09-06 18:48:02 +00:00
DanB
25babe9746 ResourceS cache for private vars test 2017-09-06 20:02:00 +02:00
DanB
a0391d7599 Merge fix, apier tests updated for actions caching 2017-09-06 19:28:32 +02:00
DanB
e1e7b5e13c StatsInstance -> StatQueue, config cache stats_queues and stats_event_queues in defaults 2017-09-06 19:07:32 +02:00
Dan Christian Bogos
f18075b9b0 Merge pull request #719 from TeoV/master
Fix rename ResourceConfig -> ResourceProfile
2017-09-06 17:46:37 +02:00
TeoV
fb81b72570 fix Rename ResourceConfig -> Resource Profile after merge 2017-09-06 11:30:13 -04:00
TeoV
6325e26c4b Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/loader_csv_test.go
	engine/loader_it_test.go
	engine/tp_reader.go
2017-09-06 10:56:40 -04:00
edwardro22
7cb965963b Refactored some tests and made some changes 2017-09-06 14:56:05 +00:00
TeoV
c5c030d561 Rename ResourceConfig -> ResourceProfile 2017-09-06 10:44:33 -04:00
edwardro22
dfd9e6f809 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-06 10:59:25 +00:00
edwardro22
d8a44e64ed Updated versions 2017-09-06 10:59:09 +00:00
DanB
dd8afa2486 ResourceService with map as longCache 2017-09-05 19:09:42 +02:00
DanB
c11d56ca37 Loader tests resLimits -> resCfgs 2017-09-05 18:50:42 +02:00
DanB
4b1613e9e5 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-05 18:41:06 +02:00
DanB
411c0a56fc Fix test tpreader 2017-09-05 18:40:58 +02:00
DanB
6314309875 TpReader - create Resources when not in dataDB together with ResourceConfigs 2017-09-05 18:34:26 +02:00
TeoV
36d3fb9538 Rename ResourcesConfig -> ResourceConfigs in utils/apitpdata.go and set ResourceConfig=3 and Resource=0 in general_tests/tutorial_it_test.go on line 107 2017-09-05 08:39:19 -04:00
Dan Christian Bogos
5a13c1a6dd Merge pull request #717 from TeoV/master
Implement Resource in Cache and delete comments
2017-09-05 14:36:57 +02:00