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

93 Commits

Author SHA1 Message Date
Frank Zhang 62c5cefb82 CLOUDSTACK-7834 
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone
 2014-11-03 16:43:09 -08:00
Frank Zhang 2ae40237a4 CLOUDSTACK-7795 
Fix multiple baremetal rct configuraitons
 2014-10-27 15:14:08 -07:00
Daan Hoogland 1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master 
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
 2014-10-16 12:29:37 +02:00
Sanjay Tripathi 80e0c99189 Removed duplicate code and unused imports which was causing build failure. 2014-10-16 13:53:32 +05:30
Damodar 50185b7c3a CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 2014-10-13 14:42:00 +05:30
Hugo Trippaers 5990ed4610 Move the PrepareKickstartPxeServerCommand to the core api so other 
modules can use it.
(cherry picked from commit b6401b04f22b0a5b686c7c477da4c6e0fd18df84)

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
 2014-10-13 00:22:50 -04:00
David Nalley ffe846673c more revert cleanup 2014-10-12 23:31:17 -04:00
David Nalley ac48aa8e0c cleaning up some from a revert 2014-10-12 23:30:04 -04:00
Frank Zhang 01dada100a CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-10-06 16:03:19 -07:00
Frank Zhang 44a4158c48 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-25 10:35:49 -07:00
Frank Zhang 9425f06d77 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-23 11:37:26 -07:00
Frank Zhang b8795d8879 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-22 15:56:57 -07:00
Frank Zhang 6655d8f5b0 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-22 15:24:54 -07:00
Frank Zhang 6155d3ecaa CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-22 13:57:32 -07:00
Frank Zhang b11e3bc60a CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Frank Zhang 8b89494a35 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-18 16:54:37 -07:00
Frank Zhang e06fa18ed2 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-10 14:43:41 -07:00
Frank.Zhang 10544e287b CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-05 16:28:34 -07:00
Frank.Zhang c301bd1c94 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-09-05 16:28:33 -07:00
Fred Clift 355eb72c7d make virtual router /latest/.htaccess file be static - no longer dynamically generate it, remove code that managed the file previously 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
 2014-09-04 04:22:27 -04:00
Hugo Trippaers 328599ae0b Don't depend on static paths especially if we are already checking that 
location using the getResource call.
 2014-08-13 09:02:04 +02:00
Frank.Zhang 12ad254069 CLOUDSTACK-6278 
Baremetal Advanced Networking support

    add missing license header
 2014-08-05 11:11:02 -07:00
Frank.Zhang 1ee7e0c77e CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-08-04 15:00:44 -07:00
Frank.Zhang 44dff6c426 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-08-04 15:00:44 -07:00
Frank.Zhang 66fff6c574 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-08-04 15:00:43 -07:00
Anthony Xu 330c4ba578 completed the new vmsync TODOs in the code. 
removed old vmsync logic
 2014-07-28 12:51:37 -07:00
Frank.Zhang 62e005b97e CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 16:06:33 -07:00
Frank.Zhang 65497b69c7 CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 14:52:45 -07:00
Frank.Zhang ce1b633daf CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 11:46:55 -07:00
Frank.Zhang 7b444183db CLOUDSTACK-6278 
Baremetal Advanced Networking support
 2014-07-07 11:37:38 -07:00
Hugo Trippaers cd0ef09344 Fix typo and add the right exception to the error map. 2014-06-25 15:51:28 +02:00
Alena Prokharchyk 6c23e201ad 1) More fixes for the problems found by findBugs 
2) Corrected some logging in  MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
 2014-03-13 16:05:45 -07:00
Anthony Xu ab1d3af460 Use seperate path to sync VM metadata for XS 
VM status sync only does VM status sync
 2014-03-05 15:44:50 -08:00
Mandar Barve b0c6d47347 - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-25 22:59:10 +01:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08: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 e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Kelven Yang fc9adec72e CLOUDSTACK-669: Add host level side-by-side VM state report for graceful sync model migration 2013-11-12 18:32:51 -08:00
Bharat Kumar 7095ea2b5e CLOUDSTACK-4738 Dynamic compute offering. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-07 12:41:20 +05:30
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
Laszlo Hornyak bd8536739c remove txn attribute from DB 
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-04 10:15:39 -07:00
Alex Huang b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00