13297 Commits

Author SHA1 Message Date
olivier lamy
7999dd06ac add note in README for installing maven third parties jars 2012-08-28 23:36:21 +02:00
olivier lamy
f218003607 Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack 2012-08-28 23:30:57 +02:00
Likitha Shetty
8c3450b503 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
Brian Federle
a52889bb6a CS-16196: Fix VM wizard network selects
-Fixes case where 1 existing network is present, but cannot be
 unchecked when 'add new network' is checked

-Fixes regression with multiple networks and VPC tiers present, where
 unchecking all regular networks will select the hidden VPC network

reviewed-by: jessica
2012-08-28 13:52:15 -07:00
Jessica Wang
a319ac7055 cloudstack 3.0 UI - VPC - check in translated labels. (Reviewed-by: Brian) 2012-08-28 11:47:32 -07:00
Darren Shepherd
ff7c964a66 Add ability to do jetty:run in eclipse 2012-08-28 09:16:44 -07:00
Darren Shepherd
43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
Darren Shepherd
7fbc59d783 Add maven profiles for non-oss stuff 2012-08-28 09:02:57 -07:00
Darren Shepherd
8aa665d3ec Third party repo no longer used 2012-08-28 09:02:28 -07:00
Darren Shepherd
d6c29fdc16 Wrong parent 2012-08-28 09:02:01 -07:00
Darren Shepherd
a9e7a8bac5 Add script to install non-oss deps in the local maven repo 2012-08-28 09:01:50 -07:00
Darren Shepherd
590f52df82 Include some missing resources in the jars 2012-08-28 08:59:20 -07:00
Darren Shepherd
2bc99c7360 File no longer needed 2012-08-28 08:57:59 -07:00
Chip Childers
59dea827e1 Patch from Sebastien Goasguen: In tools/devcloud switched to Ubuntu 12.04.1 iso because 12.04 url changed. 2012-08-28 11:54:19 -04:00
Pranav Saxena
36ce46c319 CS-16190:InterVlan - UI - Non-VPC Virtual Routers are not provided with an option to reboot unlike VPC Virtual Routers- Check on the vpc id being not NULL was making the reboot action hidden for a normal VR ,but if the vpc id is NULL , VPC VR won't exist 2012-08-28 13:31:27 +05:30
Abhinandan Prateek
5e0ede8bd9 bug 13946: reducing poll interval 2012-08-28 12:22:46 +05:30
Rohit Yadav
2296dc4acc bug CS-15942: Fixes port forwarding issue for redundant routers 2012-08-28 12:11:55 +05:30
Rohit Yadav
fd4a1a39c1 Bug CS-15970: Fixes Redundant router status when host is XenServer 2012-08-28 12:07:33 +05:30
Jessica Wang
ccfdb151f1 CS-15671: cloudstack 3.0 UI - Migrate SystemVM option, Migrate Router action - host dropdown - listHosts API no longer returns hasEnoughCapacity proprety. So, "Available" or "Full" is removed from dropdown option since "Available" or "Full" is determined by host's hasEnoughCapacity proprety. 2012-08-27 16:35:28 -07:00
Alena Prokharchyk
38e26f8dbd IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to
Reviewed-by: Sheng Yang
2012-08-27 16:26:32 -07:00
Sheng Yang
82cb1095dc CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account
Reviewed-by: Anthony Xu

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-27 16:11:36 -07:00
Likitha Shetty
fef8f6d4af CS-15703: EC2 tag support, improve error handling. Component: AWSAPI.
Handle exceptions thrown when invalid syntax is used to create or delete tags.
2012-08-27 15:56:13 -07:00
Brian Federle
21904cf33b UI, add network offering: Disable VPC virtual router by default
reviewed-by: jessica
2012-08-27 15:32:24 -07:00
Brian Federle
7e591a442d CS-15811: Network offering: filter by VPC supported services
Introduce a new checkbox which indicates that this service offering is
for VPC networks. If enabled, then only show the VpcVirtualRouter
option for all supported services. If disabled, then disable the
VpcVirtualRouter options

reviewed-by: jessica
2012-08-27 15:21:08 -07:00
Alena Prokharchyk
fbdc7fc59f CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network
Reviewed-by: Sheng Yang
2012-08-27 13:46:36 -07:00
olivier lamy
40f9d84ea9 versions defined in parent pom 2012-08-27 21:54:27 +02:00
olivier lamy
9fff891b88 remove tabs 2012-08-27 21:52:26 +02:00
Alena Prokharchyk
48806fcc54 VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-27 11:11:55 -07:00
Kelven Yang
3609e44b58 commit for https://reviews.apache.org/r/6608/ 2012-08-27 10:39:49 -07:00
Alena Prokharchyk
93ac01db0b Fixed unittest 2012-08-27 09:46:56 -07:00
olivier lamy
fe8a01106b rename cloud-plugins to cloudstack-plugins 2012-08-27 16:53:51 +02:00
olivier lamy
c68dd35b6e Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-27 16:44:18 +02:00
olivier lamy
a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
Kishan Kavala
f1ab3ae94c bug CS-10928: Check for delta cpu utilization before updating stats
status CS-10928: resolved fixed
reviewed-by: Prasanna
2012-08-27 19:40:27 +05:30
Hugo Trippaers
e2b814d045 If there already is an entry in the nic mapping table for a starting VM,
try to reconcile with the Nicira Controller.
2012-08-27 13:41:27 +02:00
Hugo Trippaers
0d7601d2d7 Add a limit statement to the subquery 2012-08-27 09:14:38 +02:00
olivier lamy
3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
Edison Su
cefc5cbff3 bug CS-16172
Reviewed-by: chiradeep
2012-08-24 16:13:29 -07:00
olivier lamy
0d9b81aac6 that was an unused import not a missing dependency 2012-08-25 00:44:14 +02:00
Jessica Wang
f9fdbcddb1 cloudstack 3.0 UI - VPC feature - localize network.js (Reviewed-by: Brian) 2012-08-24 15:41:41 -07:00
olivier lamy
e7b4e15b42 add missing dependency 2012-08-25 00:37:25 +02:00
olivier lamy
ccf624f7a8 add third party repo in pom to short cli to use 2012-08-25 00:16:31 +02:00
olivier lamy
071836327e use maven compiler plugin 2.5.1 which is faster for multi modules builds 2012-08-25 00:12:33 +02:00
olivier lamy
7343ef20ee use apache parent pom to inherits some datas 2012-08-25 00:10:29 +02:00
olivier lamy
e79e339682 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-08-25 00:04:56 +02:00
olivier lamy
5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
olivier lamy
9fb282b366 use stable central repo url 2012-08-24 23:59:34 +02:00
Jessica Wang
57f0f20dca cloudstack 3.0 UI - VPC feature - add VPC localization labels for network.js in dictionary.jsp (Reviewed-by: Brian) 2012-08-24 14:56:54 -07:00
Jessica Wang
6807da63bb cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_ja.properties for network.js (Reviewed-by: Brian) 2012-08-24 14:56:10 -07:00
Jessica Wang
de85e211c3 cloudstack 3.0 UI - VPC feature - localize VPC labels in messages_zh_CN.properties for network.js (Reviewed-by: Brian) 2012-08-24 14:55:33 -07:00