Edison Su
e8259e38c2
integration test is passed again
2013-05-12 14:41:06 -07:00
Pranav Saxena
225a46746a
Correcting the text for alert types
2013-05-13 01:53:33 +05:30
Pranav Saxena
34a3fd6d02
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
2013-05-13 00:00:29 +05:30
Pranav Saxena
0ed0e9a26e
CLOUDSTACK-1828:NAT on private gateway UI support
2013-05-12 23:59:39 +05:30
Koushik Das
80720dc4ac
CLOUDSTACK-2409: Cisco VNMC Access credentials validatation is not enabled with addCiscoVnmcResource
...
Enabled credentials validation by doing a login to the VNMC appliance
2013-05-12 17:00:48 +05:30
Nitin Mehta
941a9a5fb7
license check
2013-05-12 14:42:59 +05:30
Nitin Mehta
5f0f1001be
remove unwanted files
2013-05-12 14:30:10 +05:30
Nitin Mehta
fa1217576b
db conflict resolve
2013-05-12 13:59:14 +05:30
Nitin Mehta
e107776d75
build master
2013-05-12 13:14:33 +05:30
Min Chen
fdb523d219
Remove a debug code.
2013-05-12 00:01:44 -07:00
Min Chen
0d580ccb26
Fix NPE in adding host and also put back lost change in deployDataCenter
...
due to rebase with master.
2013-05-11 22:00:40 -07:00
Min Chen
1bd216fc48
Merge with latest code rebased from master
2013-05-11 21:05:54 -07:00
Min Chen
f8e51f70a1
Invoke reatetmplt.sh script after copying template from S3 to cache
...
storage.
2013-05-11 18:19:29 -07:00
Min Chen
3d91a4e012
Fix a bug in searching for existing image stores.
2013-05-11 18:18:12 -07:00
Nitin Mehta
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
Nitin Mehta
836a3f1252
add missing file
2013-05-11 15:02:12 +05:30
Nitin Mehta
5f9263b161
fix build
2013-05-11 14:27:19 +05:30
Nitin Mehta
1731a4a442
Add the new APIs along with tests
2013-05-11 14:13:38 +05:30
Edison Su
993187622e
fix compile, after rebase to master
2013-05-10 20:39:02 -07:00
Edison Su
36146e7f65
create volume command needs to send to vmwareresource
2013-05-10 19:26:44 -07:00
Edison Su
90de46c4fe
get vmware works
2013-05-10 19:26:44 -07:00
Min Chen
8a9a7a4adc
Fix a bug in create cache object for S3.
2013-05-10 17:53:32 -07:00
Chiradeep Vittal
074901365f
CLOUDSTACK-2324 Since wheezy (temporarily) does not have haproxy, install from squeeze. We cannot install from sid since that version depends on libc6(>=2.15) while wheezy has libc6 at 2.13-38
2013-05-10 17:11:12 -07:00
Alex Huang
dfd6a29fba
Fixed failed unit test
2013-05-10 17:02:23 -07:00
Alex Huang
342624e0eb
Merged with head
2013-05-10 16:33:57 -07:00
Alex Huang
3047929367
Merged
2013-05-10 16:21:43 -07:00
Brian Federle
df0919bef5
Add placeholder network ACL list view
2013-05-10 16:03:44 -07:00
Brian Federle
6ac4f79397
VPC chart: add link to public IP addresses list
2013-05-10 15:48:32 -07:00
Brian Federle
2eb29a5d81
Tier details: disable view all link, ACL tab
2013-05-10 15:42:18 -07:00
Brian Federle
daf392685a
Add tier detail view
2013-05-10 15:41:44 -07:00
Brian Federle
55ac9c1b0f
Add private gateway section to new chart
2013-05-10 15:25:46 -07:00
Brian Federle
3f22b6a3e5
Create panel on click of dashboard item
2013-05-10 15:15:45 -07:00
Pranav Saxena
7ca488334f
CLOUDSTACK-1828:NAT on private gateway UI support
2013-05-11 02:50:16 +05:30
Brian Federle
d00077ab78
Merge branch 'master' into ui-vpc-redesign
2013-05-10 13:32:41 -07:00
Brian Federle
8811bcc38d
Merge branch 'master' into ui-cisco-asa1000v-support
2013-05-10 12:52:21 -07:00
Pranav Saxena
b7f10bffae
Removing the @Test annotation for building master successfully for one of the test cases for InternalLb element as discussed with Alena
2013-05-11 01:21:50 +05:30
Edison Su
47f6d650f8
fix vmware build
2013-05-10 12:48:49 -07:00
Milamber
791c68fc11
Fix doc: MySQL not Tomcat
2013-05-10 19:56:57 +01:00
Jessica Wang
1177589a6b
CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - physical network - network service providers - Cisco VNMC - fix a bug that detailView loads forever.
2013-05-10 11:54:17 -07:00
Edison Su
15fc4e137d
add license header
2013-05-10 11:40:11 -07:00
Alena Prokharchyk
f12ac95a56
VPC: When Netscaler is LB provider for the VPC, the VpcVirtualRouter can't provide LB services
2013-05-10 11:18:30 -07:00
Milamber
80dd9f28c5
Documentation - replace cloud-(management|usage|agent) by cloudstack-(management|usage|agent), and some typo
2013-05-10 19:10:51 +01:00
Alena Prokharchyk
59316a4d19
VPC:
...
1) In unittest, removed the unsed Dao from components scan
2) Netscaler and InternalLb element shouldn't impelement VPC provider as they provide only LB services support
2013-05-10 10:42:56 -07:00
Jessica Wang
bf74de23c4
CLOUDSTACK-2351: object store - UI - infrastructure menu - secondary storage - Add Secondary Storage - S3 provider - when Create NFS Cache Storage is checked, call extra API createCacheStore.
2013-05-10 10:27:19 -07:00
Brian Federle
f7fab6f801
Merge branch 'ui-cisco-asa1000v-support'
2013-05-10 10:02:46 -07:00
Edison Su
e444867e61
fix compile
2013-05-10 09:47:09 -07:00
Alena Prokharchyk
846729a3ab
Fixed VPC start - added internallb element to the list of supported providers
2013-05-10 09:07:03 -07:00
Radhika PC
da74554ba1
CLOUDSTACK-893 conceptual info around gslb
2013-05-10 18:26:46 +05:30
Koushik Das
530b0beb3c
CLOUDSTACK-2417: NPE while creating Egress rules with Networking using Cisco ASA firewall provider
...
An input parameter was incorrectly interpreted during egress rule creation and so resulted in NPE. Created a new vnmc xml for handling creation of egress rule with protocol as 'All'
2013-05-10 17:54:59 +05:30
Kishan Kavala
b4aff6190f
CLOUDSTACK-2309: Add fix to handle Vmware 4.0 template upgrade
2013-05-10 17:27:10 +05:30