apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,354 Commits 304 Branches 324 Tags
Commit Graph

744 Commits

Author SHA1 Message Date
Rajesh Battala
39aa7d86af Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework 
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
 2012-08-31 11:44:58 -07:00
Darren Shepherd
34f007f13a Current working dir for jetty:run Eclipse configuration is half way broken 2012-08-30 09:00:49 +02:00
Brian Federle
5c69742f7d Update zone wizard disclaimer text for local storage 
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
 2012-08-29 15:45:25 -07:00
Jessica Wang
4a9f77610c cloudstack 3.0 UI - check in translated labels for VPC widget (Reviewed-by: Brian) 2012-08-29 10:58:55 -07:00
Hugo Trippaers
1b8b7b1bba Help the magic a little bit 2012-08-29 10:47:50 +02:00
Jessica Wang
2e6759093c cloudstack 3.0 UI - Spanish translation file is out-of-date and never used in 3.0 UI, therefore remove it from branch. 2012-08-28 16:03:40 -07:00
Jessica Wang
5b556e202e cloudstack 3.0 UI - add translation labels for VPC widget. (Reviewed-by: Brian) 2012-08-28 15:59:13 -07:00
olivier lamy
de31ac34b4 configure tomcat maven plugin too 2012-08-29 00:05:56 +02:00
olivier lamy
f6f1be62b9 configuring tomcat maven plugin too 2012-08-28 23:58:06 +02:00
olivier lamy
f218003607 Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack 2012-08-28 23:30:57 +02: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
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
Jessica Wang
caae9f7e04 cloudstack 3.0 UI - VPC feature - localize VPC labels in messages.properties for network.js (Reviewed-by: Brian) 2012-08-24 14:54:38 -07:00
Jessica Wang
7f8734f124 CS-15802: cloudstack 3.0 UI - stop/reboot virtualRouter/network - add text "All services provided by this virtualRouter/network will be interrupted" in confirm dialog. 2012-08-23 14:08:20 -07:00
Brian Federle
b302ed904a CS-16144: Show warning before enabling local storage in zone wizard 
Conflicts:
	ui/dictionary.jsp
 2012-08-23 11:08:48 -07:00
Jessica Wang
beb9baf950 cloudstack 3.0 UI - VPC feature - add new translation labels in messages.properties (Reviewed-by: Brian) 2012-08-21 16:49:55 -07:00
Prachi Damle
511e3cb235 [ASFCS40]CS-15373: Awsapi port change to 7080. 
Reviewed-By: Frank

Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack

Conflicts:

	awsapi/conf/cloud-bridge.properties
	client/tomcatconf/server-ssl.xml.in
 2012-08-21 16:27:55 -07:00
Brian Federle
ad2b8d7579 CS-16044: Zone wizard: Add 'use local storage' checkbox 
Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.

Conflicts:
	ui/index.jsp
 2012-08-20 11:36:57 -07:00
Brian Federle
b391a1c5b1 CS-16010: Add missing alt tag for 'move to bottom' reorder action 2012-08-16 13:56:07 -07:00
Mice Xia
5dcf639acc Fix a bug, failed to show resource limit page in project view due to missing vpc limit type 2012-08-16 20:17:42 +08:00
Brian Federle
b5e1c53137 CS-15892: Tier detail view: Show 'tier details' instead of 'details' 
Conflicts:
	ui/index.jsp
 2012-08-07 16:02:07 -07:00
Brian Federle
469e180515 multiEdit: better handling for tag widget 
Place tagging widget in a separate action and dialog class; it is
indicated by a 'tag' icon for better clarity.

-- This removes the requirement to specify a dummy 'edit' action on
multi-rules; instead, the separate tag action will appear automatically
as long as 'tags' is specified under the multiEdit's properties.

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/css/cloudstack3.css
	ui/index.jsp
 2012-08-06 14:15:41 -07:00
Hugo Trippaers
cf06317671 Probably a left-over of a merge conflict 2012-08-02 09:33:48 +02:00
Alena Prokharchyk
ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Brian Federle
8c8c10fbbd CS-15799: Show 'network domain' instead of 'network domain text' 2012-08-01 14:36:15 -07:00
Chip Childers
99b0ea7b10 License header update for the client folder 2012-08-01 13:49:10 -04:00
Sheng Yang
736c4c1510 CS-15670: Allow normal users to configure S2S VPN 2012-07-27 16:27:36 -07:00
Alena Prokharchyk
a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
Salvatore Orlando
7b18b72eca CS-15664 There is a typo in component.xml relating to Nicira NVP Integration 2012-07-25 15:14:40 +05:30
Alena Prokharchyk
6420ecbd6f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 16:13:06 -07:00
Hugo Trippaers
766a17b3ef Typo in components.xml.in 2012-07-24 15:47:40 -04:00
Pranav Saxena
dade14aab1 CS-15540: Shared Networks IPs in Advanced Zone appear as 'Direct IP' in System-Wide-Capacity Dashboard 2012-07-24 01:25:05 +05:30
bfederle
c8f72c9198 Merge branch 'master' into vpc 
Conflicts:
	ui/scripts/network.js
 2012-07-23 10:36:25 -07:00
David Nalley
385f2e7923 cleaning up a few last license headers in client 2012-07-20 14:02:24 -04:00
kishan
f2bbf62d9d Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only. 2012-07-18 14:20:04 -07:00
Alena Prokharchyk
14fa5279e2 Merge branch 'master' into vpc 2012-07-17 17:12:17 -07:00
Edison Su
dfb0eed5a4 fix ubuntu 12.04 build 2012-07-16 18:00:05 -07:00
kishan
88205a7a83 Added ant target deploy-server-encrypt to enable encryption in dev setup 2012-07-16 16:11:44 -07:00
Alena Prokharchyk
a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Hugo Trippaers
79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Sheng Yang
37ab2dd49b S2S VPN: Add privilege for normal users on list commands 2012-07-10 18:58:33 -07:00
Alena Prokharchyk
353423acec Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-06 12:04:10 -07:00
Brian Federle
093af8a6a9 CS-15388: Fix labels 
Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM

Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
 2012-07-06 10:27:09 -07:00
Alena Prokharchyk
31f9d718fb Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-03 17:32:50 -07:00
Alena Prokharchyk
5bcf73080a Merge branch 'master' into vpc 2012-07-02 17:47:01 -07:00
Alena Prokharchyk
b565f63e42 VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation) 
Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-02 17:44:28 -07:00
Sheng Yang
3995dc9cb1 CS-6840: Fix wrong command name 2012-07-02 16:28:54 -07:00
Sheng Yang
24c480f9e6 CS-6840: Add commands for site-to-site vpn 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-02 16:26:34 -07:00