apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,896 Commits 308 Branches 324 Tags
Commit Graph

228 Commits

Author SHA1 Message Date
Mike Tutkowski
ac2bccd2a2 Removing unused imports 2015-05-07 13:52:25 -06:00
Daan Hoogland
1c408dec37 Merge branch '4.5' after 4.5.1 vote passes 2015-05-07 16:03:26 +02:00
Rohit Yadav
4ba72a877c Updating pom.xml version numbers for release 4.5.2-SNAPSHOT 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-05-07 15:33:01 +02:00
Rohit Yadav
0eb4eb2370 Updating pom.xml version numbers for release 4.5.1 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-05-04 12:17:03 +02:00
Rajani Karuturi
0b8355920e Merge branch 'volume-upload' into master 
This closes #206
 2015-04-29 11:12:53 +05:30
Rajani Karuturi
843f6b1691 CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP) 
Added a source column to the user table.

Source now has only two values UNKNOWN,LDAP with UNKNOWN being the
default and is an enum is com.cloud.User.

When the source is UNKNOWN, the old method of authenticating against all
the available authenticators is used. If a source is available, only
that particular authenticator will be used.

added overloaded methods in AccountService to createUserAccount and
createUser with source specified.

(cherry picked from commit 5da733072e838c830720909ef5ba27ef6ce6d0b0)
 2015-03-16 14:53:53 +05:30
Rajani Karuturi
5da733072e CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP) 
Added a source column to the user table.

Source now has only two values UNKNOWN,LDAP with UNKNOWN being the
default and is an enum is com.cloud.User.

When the source is UNKNOWN, the old method of authenticating against all
the available authenticators is used. If a source is available, only
that particular authenticator will be used.

added overloaded methods in AccountService to createUserAccount and
createUser with source specified.
 2015-03-16 12:35:37 +05:30
Rohit Yadav
c198dfdb7a Update pom and version usage to 4.5.1-SNAPSHOT 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-03-12 12:13:18 +05:30
Rohit Yadav
a75ff23131 CLOUDSTACK-8273: fix baremetal account creation 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e000646790597cb6c245311f57761b41d23a4e34)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 2015-02-27 15:55:09 +05:30
Rohit Yadav
e000646790 CLOUDSTACK-8273: fix baremetal account creation 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-27 15:52:25 +05:30
Rohit Yadav
6df2fe7a8a CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit cb08707addbffa12abc50aec9ad980059f23910c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
 2015-02-26 17:47:01 +05:30
Rohit Yadav
cb08707add CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-02-26 17:42:21 +05:30
Damodar
01cc1b816d CLOUDSTACK-7792: Usage Events to be captured based on Volume State Machine 
(cherry picked from commit 781648fb1003c8c32875e9ff7a6c4ef4694539f7)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
 2015-02-05 15:22:21 +05:30
Damodar
8ec6d0471c CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events 
(cherry picked from commit 50185b7c3a1fd26e9a8635c28cee70fda32d3fc5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2015-02-05 14:56:52 +05:30
Koushik Das
6ff8752fd0 volume-upload: gc thread to clean partially uploaded files 
Fixed multiple issues in the template code path
 2015-01-31 17:25:19 +05:30
Saksham Srivastava
a1791cb4a8 CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException 
(cherry picked from commit 1df0453d27e8378065c15878067fc9d2dc961e30)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2015-01-18 17:28:17 +05:30
Saksham Srivastava
1df0453d27 CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException 2014-12-18 14:27:55 +05:30
Rajani Karuturi
7e030ee72d volume upload: persisting the template metadata 
on calling GetUploadParamsForTemplate, persisting the metadata to db
validating the account limits and incrementing the appropriate limits
encoded the metadata on management server using preshared key
 2014-12-16 11:52:09 +05:30
Laszlo Hornyak
3577423da9 removed executable flags from java classes 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:01 +01:00
Frank Zhang
28d5b9827a remove duplicate import 2014-11-03 17:04:30 -08:00
Frank Zhang
c8f72780ea CLOUDSTACK-7834 
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
 2014-11-03 16:44:53 -08:00
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
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
Frank Zhang
1b535e20e6 fixing build because missig ListBaremetalRctCmd 2014-10-27 16:52:05 -07:00
Frank Zhang
1b0a0d68f1 CLOUDSTACK-7795 
Fix multiple baremetal rct configuraitons

Conflicts:
	api/src/com/cloud/event/EventTypes.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 2014-10-27 16:11:26 -07: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
dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02: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