apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,953 Commits 304 Branches 324 Tags
Commit Graph

66 Commits

Author SHA1 Message Date
Rohit Yadav
9555492b4d Merge branch '4.9' 2016-08-23 14:16:53 +05:30
Rohit Yadav
f13c224da1 Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2016-08-19 13:53:39 +05:30
Will Stevens
62aa3b2bfa Updating pom.xml version numbers for release 4.10.0-SNAPSHOT 
Signed-off-by: Will Stevens <williamstevens@gmail.com>
 2016-07-29 10:11:34 -04:00
Will Stevens
227ff3884d Updating pom.xml version numbers for release 4.9.0 
Signed-off-by: Will Stevens <williamstevens@gmail.com>
 2016-07-25 16:56:04 -04:00
Remi Bergsma
43ab98d823 Updating pom.xml version numbers for release 4.9.0-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2016-01-26 15:12:20 +01:00
Remi Bergsma
32fcc47117 Updating pom.xml version numbers for release 4.8.1-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2016-01-26 09:39:00 +01:00
Remi Bergsma
62f218b7bd Updating pom.xml version numbers for release 4.8.0 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2016-01-20 23:43:35 +01:00
Remi Bergsma
8f5a2920e8 Updating pom.xml version numbers for release 4.8.0-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2015-12-21 22:09:31 +01:00
cirstofolini
1a64c247ad Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses. 2015-11-21 18:31:11 -02:00
Remi Bergsma
1f53f2a93e Updating pom.xml version numbers for release 4.7.0-SNAPSHOT 
Signed-off-by: Remi Bergsma <github@remi.nl>
 2015-11-15 18:54:13 +01:00
Rajani Karuturi
8bc0294014 Revert "Merge pull request #714 from rafaelweingartner/master-lrg-cs-hackday-003" 
This reverts commit cd7218e241a8ac93df7a73f938320487aa526de6, reversing
changes made to f5a7395cc2ec37364a2e210eac60720e9b327451.

Reason for Revert:

noredist build failed with the below error:
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.2:compile (default-compile) on project cloud-plugin-hypervisor-vmware: Compilation failure
[ERROR] /home/jenkins/acs/workspace/build-master-noredist/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java:[484,12] error: non-static variable logger cannot be referenced from a static context
[ERROR] -> [Help 1]

even the normal build is broken as reported by @koushik-das on dev list
http://markmail.org/message/nngimssuzkj5gpbz
 2015-08-31 11:27:57 +05:30
Rafael Weingartner
3818257a68 Solved jira ticket: CLOUDSTACK-8750 2015-08-28 22:35:08 -03:00
Daan Hoogland
75093dcd8f CLOUDSTACK-8656: checkstyle no longer used import removed 2015-08-03 21:10:11 +02:00
Daan Hoogland
1f460f4174 CLOUDSTACK-8656: messages on SQL exception in DbUtils! 2015-08-03 20:49:02 +02:00
Daan Hoogland
87ae150159 CLOUDSTACK-8656: replace empty catch block on close by try-with-resource 2015-08-03 19:42:47 +02:00
Daan Hoogland
4ad178e4b1 rats: licenses added 
Signed-off-by: Daan Hoogland <daan@onecht.net>

This closes #535
 2015-07-07 13:48:20 +02:00
Daan Hoogland
d8ab5f3ab8 findbugs: equals unit tests 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2015-07-07 13:48:19 +02:00
Daan Hoogland
34629446b6 findbugs equals(obj) implementations go against the contract these are removed from the call into separate calls 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2015-07-07 13:48:19 +02:00
Rajani Karuturi
4c5f792ca9 Merge branch '4.5' 2014-11-05 15:20:34 +05:30
Rajani Karuturi
c3e5964dcb Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work 
In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35
 2014-11-05 11:49:38 +05:30
Hugo Trippaers
4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Hugo Trippaers
dba4a8c837 cleaning more conflicts 2014-10-13 00:19:20 -04:00
Hugo Trippaers
fe325ab576 CLOUDSTACK-7624 The value field of the configuration table is not big enough for some values 
(cherry picked from commit 9eb86560c9b83456be9ee32e8b713b213baed7bb)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-10-02 09:58:45 +02:00
Harikrishna Patnala
5d389b1a71 CLOUDSTACK-5992: default values of configuraiton parameters in configuration table are set NULL on fresh setup Some configuration parameters have Component names different from fresh and upgrade setup 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-09-05 14:59:33 +05:30
Hugo Trippaers
dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Nitin Mehta
77dadd75c4 CLOUDSTACK-6787: Publishing uuids missing in some cases, adding/correcting events in some cases. 
Also fixed a bug in the global config framework.
 2014-07-21 14:08:18 -07:00
Daan Hoogland
8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Hugo Trippaers
4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Alena Prokharchyk
a0197006ef Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package 2014-01-21 17:19:52 -08:00
Alex Huang
68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management 
of keys out of management server
 2014-01-14 13:11:35 -08:00
Harikrishna Patnala
fd0fabd3e2 CLOUDSTACK-5551: Search not working for Configuration parameters in (Account/zone/cluster/storage) settings page 
Added filters while listing scoped configuration parameters.
Fixed: Some parameters are missing from UI settings tab because of missing scope entry in configuration table.

Signed-off-by: Koushik Das <koushik@apache.org>
 2014-01-02 16:18:21 +05:30
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers
cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Harikrishna Patnala
c29cd9d3c7 CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot 
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot

CLOUDSTACK-5163: missing parameters in configuration table
 2013-11-15 12:19:31 +05:30
Hugo Trippaers
5cb3cd64e5 Fix CID 1116741,1116742 Resource leak 2013-11-07 16:23:20 +01:00
Darren Shepherd
e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2013-10-23 11:14:42 -07:00
Darren Shepherd
205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' 
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-10-23 10:40:44 -07:00
Anthony Xu
e33ae74067 CLOUDSTACK-4649: 
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.

Anthony
 2013-10-22 17:54:51 -07:00
Darren Shepherd
f62e28c1ec New Transaction API 
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
 2013-10-16 09:21:00 -07:00
Darren Shepherd
12146ce40c Move ConfigurationDao and ConfigDepot to system context 
Previously ConfigurationDao and ConfigDepot was in the bootstrap context
which was not needed.  Moving down to system to be more consistent with
the database upgrade checks.
 2013-10-03 09:14:00 -07:00
Darren Shepherd
67186429e1 Spring Modularization 
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
 2013-10-02 15:41:04 -07:00
Darren Shepherd
4590813836 Fix UsageServer startup 
Add back @Component to ConfigurationDaoImpl and scan for the package in
Spring config.
 2013-10-01 10:30:36 -07:00
Darren Shepherd
19ef999e36 Wrong field was used in check 2013-09-30 10:07:28 -07:00
Darren Shepherd
2e29c89b84 Default null value in ConfigKey results in NPE on second start 2013-09-30 08:54:02 -07:00
Alex Huang
bf6a5ff023 Added a ManagementServer scope but it isn't used yet. Added @Deprecated to one of the constructors 2013-09-18 09:34:24 -07:00