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

50 Commits

Author SHA1 Message Date
Chip Childers 2e2dd684d2 Updating pom.xml version numbers for release 4.1.2-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-07-31 11:06:29 -04:00
ilya musayev cf2babe7a7 Revert "Updating pom.xml version numbers for release 4.1.1" 
This reverts commit d2c646f0a4.
 2013-07-25 13:55:33 -04:00
ilya musayev d2c646f0a4 Updating pom.xml version numbers for release 4.1.1 
Signed-off-by: ilya musayev <ilya@apache.org>
 2013-07-25 13:52:58 -04:00
ilya musayev 8794bb6346 Revert "Updating pom.xml version numbers for release 4.1.1" 
This reverts commit 8fe3505cba.
 2013-07-24 13:13:09 -04:00
ilya musayev 8fe3505cba Updating pom.xml version numbers for release 4.1.1 
Signed-off-by: ilya musayev <ilya@apache.org>
 2013-07-24 13:11:48 -04:00
Chip Childers 707f95dfa0 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-06-15 13:14:40 -04:00
Chip Childers 780439e3bb Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit a5214bee99.
 2013-05-28 09:22:01 -04:00
Chip Childers a5214bee99 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-28 09:16:12 -04:00
Chip Childers aa29234ee0 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit d0da9f7f46.
 2013-05-28 09:09:22 -04:00
Chip Childers d0da9f7f46 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-28 09:03:41 -04:00
Chip Childers 8a99d19b34 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit db007da152.
 2013-05-26 10:36:16 -04:00
Chip Childers db007da152 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-26 10:32:45 -04:00
Chip Childers 2229727236 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 873c1972c7.
 2013-05-24 12:37:59 -04:00
Chip Childers 873c1972c7 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-05-24 12:31:24 -04:00
Chip Childers 29be94f3ba Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 9d8c8f2042.
 2013-04-26 15:14:00 -04:00
Chip Childers 9d8c8f2042 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-26 15:09:47 -04:00
Chip Childers 3be1754626 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit ba7ba61671.
 2013-04-23 15:22:01 -04:00
Chip Childers ba7ba61671 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-23 15:18:19 -04:00
Chip Childers e3af51bfc5 Revert "Updating pom.xml version numbers for release 4.1.0" 
This reverts commit 88098e0c81.
 2013-04-23 14:58:55 -04:00
Chip Childers 88098e0c81 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-23 14:55:22 -04:00
Chip Childers a5a7105b36 Updating pom.xml version numbers for release 4.1.0-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 19:51:20 -04:00
Chip Childers 7048baaa44 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 19:45:20 -04:00
Chip Childers 818a2c86d8 Revert "Updating pom.xml version numbers for release 4.1.0" 
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit b7abc3ca1e.
 2013-04-22 22:22:32 +01:00
Chip Childers a3c6ab58a1 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT" 
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit 8fe99e6453.
 2013-04-22 22:22:06 +01:00
Chip Childers 8fe99e6453 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 12:46:11 -04:00
Chip Childers b7abc3ca1e Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 09:42:23 -04:00
Chip Childers d168119a89 Revert "Updating pom.xml version numbers for release 4.1.0" 
Reverting for yet another attempted RC

This reverts commit b654578bd5.
 2013-04-22 09:35:21 -04:00
Chip Childers ca3b515bad Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT" 
Reverting for yet another attempted RC.
This reverts commit 5a923ca44d.
 2013-04-22 09:35:06 -04:00
Chip Childers 5a923ca44d Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 09:20:20 -04:00
Chip Childers b654578bd5 Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-22 08:55:21 -04:00
Chip Childers e119a53bfd Revert "Updating pom.xml version numbers for release 4.1.0" 
Reverting to re-spin 4.1.0 RC

This reverts commit b25d27d80b.
 2013-04-22 08:52:17 -04:00
Chip Childers 5755f6e3e8 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT" 
Reverting so that I can re-spin the 4.1.0 RC

This reverts commit c8c77f6b1c.
 2013-04-22 08:51:58 -04:00
Chip Childers c8c77f6b1c Updating pom.xml version numbers for release 4.1.1-SNAPSHOT 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-21 16:26:50 -04:00
Chip Childers b25d27d80b Updating pom.xml version numbers for release 4.1.0 
Signed-off-by: Chip Childers <chipchilders@apache.org>
 2013-04-21 16:18:04 -04:00
Min Chen 0afc2d0033 CLOUDSTACK-1484: provide api.throttling.enabled gloabl configuration settings to enable/disable api throttling feature. 2013-03-05 11:26:20 -05:00
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