fe9398dc73
Summary: Fix S3 from trying to upload directories found in template dirs
...
Detail: The S3 upload code fails on directories in the templates dir, such as
"KVMHA" that gets created for KVM. This skips directories in the templates dir.
BUG-ID: CLOUDSTACK-1056
Bugfix-for: 4.1 (master)
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359390176 -0700
2013-01-28 09:22:56 -07:00
afd7de7e33
CLOUDSTACK-1076: Legal documentation improvements to separate source
...
distributions from packaged distributions.
* Remove all binary dependency license and notice info from the top
level LICENSE and NOTICE files in our source tree
* Create two copies of the Whisker descriptor.xml file (stored in
tools/whisker), one that can be used to regenerate the source distro's
LICENSE and NOTICE files, and one that can generate an appropriate
LICENSE and NOTICE file for a packaged version of the software.
* Generate and commit the package LICENSE and NOTICE file to the
tools/whisker folder.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-28 10:48:53 -05:00
92fd66c921
CLOUDSTACK-235 Docs patch for network rate
2013-01-28 10:47:02 -05:00
b56f7b26e2
CLOUDSTACK-399
...
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
2013-01-28 10:05:36 -05:00
ea660cd06d
removed MockAPI server
2013-01-28 17:50:38 +05:30
def9fd1f2e
remove finduser, findaccount, finddomain APIs
2013-01-28 17:04:25 +05:30
e13d93279e
make API changeServiceForVirtualMachine work by changing @entityType of parameter serviceOfferingId to ServiceOfferingResponse
2013-01-28 15:39:54 +08:00
453f749785
The overlay still exists when the Recurring Snapshots dialog is cancelled by pressing the esc key
2013-01-28 11:13:06 +05:30
fa00ddf07e
IPv6: Fix getIp6FromRange()
2013-01-27 19:07:44 -08:00
4c1a69ac33
client: Fix maven to replace nonoss spring ctx xml for nonoss build
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-27 05:40:17 -08:00
2fb346ab62
Merge branch 'master' into javelin
2013-01-27 05:20:49 -08:00
7d40a7e500
Make maven use mkisofs or genisoimage depending on what is available
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-27 04:48:47 -08:00
6c527ffbba
cli: Fix cachegen aand cloudmonkey to generate api verbs, revert last commit
...
Fixes cachegen and reverts "mvn: fix cloudmonkey build"
This reverts commit 6d3de41d42
2013-01-27 04:18:31 -08:00
6d3de41d42
mvn: fix cloudmonkey build
...
removing cachegen.py that is no longer required for execution
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-27 14:49:50 +05:30
74811fa8b4
IPv6: Disable password and userdata service for ipv6 for now
...
Would add support later.
2013-01-26 23:14:48 -08:00
8f66d266b3
IPv6: Enable VR's ability to provide DHCPv6 service
2013-01-26 23:14:42 -08:00
f89c66070b
IPv6: Update dnsmasq.conf to new version
2013-01-26 23:14:35 -08:00
9300a02ba4
IPv6: Update edithosts.sh accept parameters
2013-01-26 23:14:27 -08:00
6169c1d724
IPv6: Enable IPv6 address for router
2013-01-26 23:14:21 -08:00
bd4bc025d1
IPv6: Accept IPv6 parameter for createNetworkCmd
...
Also ass public_ipv6_address for ipv6 address management.
Extend nics and vlans for ipv6 address.
Add dependency to com.googlecode.ipv6(java-ipv6).
Modify dhcpcommand for ipv6.
2013-01-26 23:14:15 -08:00
ddb794d960
cli: generate verbs on the fly, fix autocompletion whitespace bug
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-26 17:14:09 -08:00
1509a210ca
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-01-26 23:48:57 +05:30
76b28805e6
CloudStack-965: When a detailview action is prohibited, the operation dialog box should not show up in the mean time
2013-01-26 23:46:44 +05:30
a4c778e115
test_vm_life_cycle: Don't wait a lot poll for change every expunge_cycle interval
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 23:40:01 -08:00
1450547987
Put usage server under Spring
2013-01-25 23:00:55 -08:00
221ac72a2e
test_vm_life_cycle: Consider 600s threshold for expunge.delay as per server logic
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 19:01:23 -08:00
bc40ed85e5
test_vm_life_cycle: Fix expunging logic as in mgmt server
...
Sets expunge interval to 600 if it's less than that
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 17:43:37 -08:00
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
2b67fc8441
Add nonossComponentContext.xml.in for nooss composition of CloudStack
2013-01-25 15:48:25 -08:00
af4485ae9e
Put nonoss under Spring framework
2013-01-25 15:41:48 -08:00
301b0b9090
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
init
2013-01-25 15:00:09 -08:00
fc7d07305f
Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4)
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 14:21:41 -08:00
17c419ceb4
Fix a bug in listHosts that returns wrong zoneId for host.
2013-01-25 14:18:25 -08:00
2c9e314477
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-01-25 14:15:22 -08:00
e9bca76a32
set local storage as up
2013-01-25 13:07:36 -08:00
a18baf8c83
fix compile
2013-01-25 10:24:25 -08:00
8f11f631a4
Instance wizard: Fix back button state
...
Fix case where select SG step is shown on back, instead of select guest network.
2013-01-25 08:58:07 -08:00
0ab39fd162
added missing bracket
2013-01-25 19:32:30 +05:30
cd9e4e999e
added missing bracket
2013-01-25 19:32:13 +05:30
c6ae19d12f
Merge branch 'master' into regions
2013-01-25 18:49:47 +05:30
de20cb6c1a
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:45:01 +05:30
1f57d925eb
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:41:59 +05:30
44ceff4224
CLOUDSTACK-1064:A type error occurs when trying to add account/register template: this is because of accounts conext being undefined
2013-01-25 16:42:42 +05:30
9deea9bb55
CLOUDSTACK-1063:SG Enabled Advanced Zone -Add Guest Networks- When user tries to add a guest Network with scope as Account , he should NOT be presented with Offering for shared security group enabled
2013-01-25 15:49:29 +05:30
cb25eed37a
forget to check in code
2013-01-25 00:25:14 -08:00
df5c4c3048
Fixing VPC unit test to use Spring
2013-01-24 23:05:31 -08:00
25c0d84c16
Document procedure to choose default System Offering for System VMs
...
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
2013-01-24 21:32:46 -06:00
f56b96ad19
merge: Fast forward merge branch 'javelin'
...
FF merge commit due to recent merge of master and then Edison's commit.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -08:00
356866c72b
Merge branch 'master' into javelin
...
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/swift/SwiftManagerImpl.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
6f5655cb03
generalize storage orchestration: DataObjectManager will handle all the object life cycle management
2013-01-24 18:30:08 -08:00
Marcus Sorensen
Chip Childers
Radhika PC
Kishan Kavala
Mice Xia
Pranav Saxena
Sheng Yang
Rohit Yadav
Noa Resare
Prasanna Santhanam
Isaac Chiang
Kelven Yang
frank
Min Chen
Edison Su
Brian Federle
Edison Su
Prachi Damle