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

19 Commits

Author SHA1 Message Date
Brian Spindler 469c4dd139 Removing ^M's from code. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-04 00:53:20 +05:30
Sanjay Tripathi 18695276f7 CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts 
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
    resource types.
    Added methods to set the limits on these resources using updateResourceLimit
    API command and to get a count using updateResourceCount. Also added calls in the
    Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
    resource types

    Resource Name          :: Resource type number
        Primary Storage               10
        Secondary Storage             11

    Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
 2013-03-29 11:26:38 +05:30
Rohit Yadav 854ab39556 Fix new url for centos pkging and baremetal python pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-03-26 11:27:18 +05:30
frank 31d6e5465e CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

make kikcstart working with ubuntu
 2013-03-01 17:55:49 -08:00
Bharat Kumar 23e54bb0f4 Cloudstack-711: Cpu and Ram Overcommit Ratio. 2013-02-22 17:31:06 +05:30
Mice Xia dae57c1ab2 add missing license header reported by rat 2013-02-22 13:22:14 +08:00
frank 8855d793ee CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

pass host id to baremetal discover when mgmt loads existing hosts
 2013-02-21 15:48:20 -08:00
frank 15ead099a1 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-02-21 15:48:08 -08:00
frank 55b77c7c8f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

adding missing scripts back

Conflicts:

	client/pom.xml
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
 2013-02-21 15:46:11 -08:00
frank 1f15c1e9e7 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
 2013-02-21 15:42:38 -08:00
frank 54741a2b0f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

add api annotation to baremetal related api
 2013-02-21 15:41:21 -08:00
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-20 16:42:56 +05:30
Rohit Yadav fcb4b7a6a7 CLOUDSTACK-1237: Fix an overriding method that would help find template adapter 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-13 15:19:30 +05:30
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Sheng Yang 5cb9df91a1 Merge branch 'ipv6' 
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
 2013-01-31 15:07:33 -08:00
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Rohit Yadav d7ad2da7e0 server: Fix network refactor regressions for CLOUDSTACK-297 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-30 17:33:53 -08:00
David Nalley 1b39b0e908 fixing licensing headers 2013-01-29 23:45:11 -05:00
frank 1f7eaf3d61 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
 2013-01-29 17:19:57 -08:00