Alex Huang
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
Mice Xia
dd07d1598f
Fix Bug CloudStack-9 can not change OS preference from OS to none
2012-09-04 20:51:03 +08:00
Edison Su
7d92c1dc27
continue addding new files
2012-09-01 17:38:50 -07:00
Alex Huang
b9ddcf8cfe
Started an object model for the orchestration platform
2012-08-30 15:54:33 -07:00
Alena Prokharchyk
7272b8d56b
Applying the patch from https://reviews.apache.org/r/5871/
...
Original committer: Venkata Siva Vijayendra Bhamidipati
2012-08-30 10:33:07 -07:00
Edison Su
cc73f2a8f2
add volumeorchestra
2012-08-29 18:17:18 -07:00
Kelven Yang
2300310243
Messaging facility initials for new architecture
2012-08-28 17:58:45 -07: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
Edison Su
60758785b7
Add more storage code
2012-08-27 18:07:54 -07:00
olivier lamy
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
olivier lamy
3aa469da2a
groupdId is now org.apache.cloudstack
2012-08-25 09:20:21 +02:00
olivier lamy
5ef60aceb1
%s/tab/ws/
2012-08-25 00:03:23 +02:00
Darren Shepherd
4a4007e652
Add license
2012-08-24 11:18:54 -07:00
Darren Shepherd
ebc0fa458a
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
Darren Shepherd
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
Kelven Yang
d06d6dae72
add maven eclipse project files from Darren
2012-08-23 17:55:20 -07:00
Kelven Yang
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
Darren Shepherd
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
Darren Shepherd
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
Darren Shepherd
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
Sheng Yang
95347d2a5e
CS-16119: Fix wrong container name of updateVpnCustomerGateway
...
Reviewed-by: Frank Zhang
2012-08-21 17:25:15 -07:00
Alena Prokharchyk
e252de4999
PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address
...
Reviewed-by: Frank Zhang
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-21 15:35:40 -07:00
kishan
691be5c60e
bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic
...
status CS-15577: resolved fixed
2012-08-17 17:07:13 +05:30
Alena Prokharchyk
335730dc65
CS-15999: added nics to domain router api response
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-08-16 10:50:09 -07:00
anthony
4b3af0c961
fixed typo
2012-08-15 14:06:07 -07:00
anthony
e1bfcdc1be
fix a typo
2012-08-15 13:53:43 -07:00
Sheng Yang
a3faff94ff
S2S VPN: CS-15998: Fix wrong vpc id in Site2SiteVpnGatewayResponse
2012-08-15 12:10:19 -07:00
Sheng Yang
bda9d0a843
S2S VPN: Fix license headers
2012-08-14 09:53:39 -07:00
Sheng Yang
991fb3d189
S2S VPN: Fix wrong response name
2012-08-14 09:53:35 -07:00
Alena Prokharchyk
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
tomoe@midokura.jp
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
Prasanna Santhanam
4161cea5df
CS-15833: PrepareForMigrationCommand extends Command
...
PrepareForMigrationCommand which was extending StartCommand wrongly now
extends the base Command only.
Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
2012-08-13 16:23:16 +05:30
Nitin Mehta
a50cf618ec
bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.
2012-08-13 16:20:57 +05:30
Mice Xia
17304b3910
Remove @author tag from non third-party source files in api folder
2012-08-13 15:17:22 +08:00
anthony
bf1123246a
VPC : typo in CreateNetworkACLCmd.java
2012-08-12 11:00:16 -07:00
Alena Prokharchyk
b61468d65c
Merge branch 'master' into vpc
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
Edison Su
263216caa5
Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
...
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
Alena Prokharchyk
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
Alena Prokharchyk
97e4906d8c
Merged the file with the master branch
2012-08-09 23:30:33 -07:00
Alena Prokharchyk
0d1393a2d3
Removed unsed imports
2012-08-09 23:30:11 -07:00
Alena Prokharchyk
493c8d1190
Removed @author annotation from IpAssocCommand and IpAssocAnswer
2012-08-09 23:30:11 -07:00
Alena Prokharchyk
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
Alena Prokharchyk
a1f361904e
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
...
This reverts commit da26302049f48839dc364eefd32cd5597ac05bdc.
2012-08-08 15:26:45 -07:00
Alena Prokharchyk
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Alena Prokharchyk
da26302049
Initialize user context from AccountManager
...
Conflicts:
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-08 11:17:01 -07:00
Sheng Yang
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
Alena Prokharchyk
629556c708
Fixed UserContext initialization - got broken by unittest
2012-08-07 11:51:00 -07:00
Alena Prokharchyk
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
Alena Prokharchyk
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
