d13d67bdd9
CLOUDSTACK-459: cloudstack UI - create network offering dialog - update comment in code.
2013-01-18 15:11:46 -08:00
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -08:00
189c20b665
umount loop device. If patch disk created from loop, then need to umount it in loop device, otherwise, you can only create 7 routers on one kvm host
2013-01-18 14:27:40 -08:00
2955d58976
Fix "Count" for listSnapshotPoliciesCmd.
2013-01-18 13:55:11 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
e8c0c1a8ee
Avoid some m2e error in eclipse for imported project.
2013-01-18 11:36:09 -08:00
0333225e22
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-01-18 11:14:48 -08:00
a5ac88db88
CLOUDSTACK-938: Add missing checkbatchs2svpn.sh
2013-01-18 11:01:00 -08:00
c9921ea077
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - step 5 - show network list first, then security group list. reviewed-by: Brian
2013-01-18 10:44:44 -08:00
77bc04b90f
CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - Instance wizard UI: Support advanced zone with security groups
...
For advanced zones with SG enabled, show both the add guest network
step as well as the add security group step.
reviewed-by: jessica
2013-01-18 10:38:38 -08:00
5a865462e9
Merge branch 'api_limit'
2013-01-18 09:43:54 -08:00
ce4b49d30b
network-refactor merge: fix nonoss build
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-18 09:38:49 -08:00
e45a9f3aed
CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 17:20:51 +05:30
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
51c1ca7cbe
CLOUDSTACK-1010: Fix count issue for listHosts command
2013-01-18 16:13:25 +05:30
55e8965bd0
Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk
...
Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.
BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 00:20:34 -07:00
a0bc5089d0
maven: disable awsapi by default, enable by -P awsapi profile
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 21:58:22 -08:00
593b60ca51
rat: Fix license on newly added files
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 21:37:24 -08:00
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
249dcde364
Add FactoryBean for VirtualMachineEntity to help implement dyanmic injection
2013-01-17 21:06:45 -08:00
ddf9c6586d
Transaction: cosmetics fix
...
The default data source assumption is that db server is on localhost, port 3306
and has user cloud and password cloud. The static variables rely on hardcoded
db.properties file only. We need to fix it
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 19:09:38 -08:00
e5507c3892
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
2013-01-17 18:55:14 -08:00
ddc53771bf
implement toURI
2013-01-17 18:49:50 -08:00
c4a11b9979
rename datastream to dataobject
2013-01-17 18:49:50 -08:00
4ca828c1d6
maven: disable awsapi by default, enabled by -P awsapi profile
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:40:59 -08:00
b45cdef5d9
DatabaseCreator: Process db props, sql and upgrade classes separately
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
17a94b20ec
Always use premium setting in ConsoleProxyManager
2013-01-17 18:23:06 -08:00
93985ae191
allow nested injection in ComponentContext
2013-01-17 18:23:06 -08:00
b120e19280
ApiDispatcher: In case of incorrect long int value or uuid, throw error
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:59:53 -08:00
cd37e22f9b
CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-17 17:21:52 -08:00
f264571e92
ApiServer: Fix default reponse type for apiserver on intergration port to xml
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:03:27 -08:00
f1d7d96414
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Re-re-merge for network-refactor merge
2013-01-17 17:00:24 -08:00
2d19f3b052
network-refactor: merge stomped on a logical not'
2013-01-17 16:59:48 -08:00
8d016d035b
MockConfigurationDaoImpl: Fix build issue, add base class method
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:15:15 -08:00
fb050894f5
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
able to dump xmlobject
2013-01-17 16:11:15 -08:00
cafe881acb
maven: Fix deploydb in developer/pom.xml to pass through DatabaseCreator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
ef07cde449
DBCreator: Fix ScriptRunner to strip comments, reformat code
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
9ab7960a5d
Merge branch 'master' into api_limit
2013-01-17 15:32:00 -08:00
805261a93f
Change a debug message to TRACE level.
2013-01-17 15:16:50 -08:00
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -08:00
6d155416c2
System VM can start now with Spring bootstraped management server
2013-01-17 14:22:14 -08:00
e37a82375c
Summary: Fix rp_filter for VPC router
...
Detail: VPC router was being treated like normal VR, which was an issue because
normally the VR has an eth0,1,2 which are isolated, linklocal, and public
networks respectively. rp_filter is turned on for eth0,1 and off for 2
(hardcoded). VPC however comes up with eth0,1 as public, linklocal, and no other
interfaces until new isolated networks are added, so the process doesn't work.
This change turns on rp_filter as new isolated networks are added to the VR.
BUG-ID: CLOUDSTACK-938
Bugfix-for: 4.0.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358451991 -0700
2013-01-17 12:51:38 -07:00
56cd809600
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Re-merge with network-refactor
2013-01-17 11:32:49 -08:00
0b60c0d3c9
CLOUDSTACK-995: fix failed to detect centos 6.2
2013-01-17 11:05:03 -08:00
8c5b82dfb4
Summary: several scripts are not mode executable
...
Detail: several scripts in the scripts directory weren't marked executable.
Normally this is handled/fixed in the packaging, but harder to deal with in
development environments, so marking them executable.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446902 -0700
2013-01-17 11:21:42 -07:00
b77503b5bd
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446796 -0700
2013-01-17 11:19:56 -07:00
1ff7a147bd
Revert "Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn"
...
This reverts commit 1a2e69fb22
2013-01-17 11:17:43 -07:00
1a2e69fb22
Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358446410 -0700
2013-01-17 11:13:30 -07:00
cbb7ff1c32
added missing files
2013-01-17 06:50:59 -08:00
b751b69c55
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-17 06:50:19 -08:00
Jessica Wang
Edison Su
Min Chen
Alex Huang
Sheng Yang
Chiradeep Vittal
Koushik Das
Kishan Kavala
Marcus Sorensen
Rohit Yadav
Kelven Yang
frank