etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,051 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

15 Commits

Author SHA1 Message Date
Min Chen 2ee16350dd CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:40:39 -08:00
Min Chen ee90b4cad3 CLOUDSTACK-1190: make APIChecker throw one sensible exception. 2013-02-08 11:05:11 -08:00
Min Chen f589d61334 Move Api rate limit configurations from xml file to global 
configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption.
 2013-02-07 23:48:15 -08:00
Min Chen 3050c43909 Revert "CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects" 
This reverts commit b513448ec2.
 2013-02-07 21:20:07 -08:00
Rohit Yadav b513448ec2 CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 9b691fc443)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-07 18:24:35 +05:30
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Min Chen 85de14f6a4 Increase sleep time to allow token expire to account for windows 
environment clock issue.
 2013-01-29 11:19:09 -08:00
Min Chen 1c20c80cb5 Fix unit test failure only on Windows environment. 2013-01-29 11:09:06 -08:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:18:53 -08:00
Min Chen 805261a93f Change a debug message to TRACE level. 2013-01-17 15:16:50 -08:00
Min Chen 86ada92ffa Fix some bugs and add java integration test for api rate limit plugin. 2013-01-17 15:13:51 -08:00
Min Chen 06fa338d42 Add some tests for api rate limit plugin. 2013-01-16 21:56:25 -08:00
Min Chen 4355d06a86 Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-15 15:53:19 -08:00
Min Chen 4d0c850dc8 Fix plugin component configuration. 2013-01-14 17:13:18 -08:00
Min Chen d900345a20 Ehcache implementation of APi Rate limit plugin. 2013-01-10 17:47:48 -08:00