Rohit Yadav
38eaa04b98
Pull changes from master into javelin
...
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts
Conflicts:
docs/en-US/external-firewalls-and-load-balancers.xml
plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:02:54 -08:00
Chip Childers
2b3084bba0
Per my veto vote on the dev list, reverting "SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak"
...
This reverts commit 106730ccdde30450e96d080ed6c9791682fb7300.
2013-01-11 10:19:38 -05:00
Radhika PC
499c474ed0
Autoscale Documentation : Reviewed-By: Jessica Tomechak
2013-01-11 17:53:09 +05:30
Radhika PC
106730ccdd
SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak
2013-01-11 15:54:00 +05:30
Pranav Saxena
bb59c1e385
Revert "<message>"
...
This reverts commit 5dd14f322c7332ebb5b9aee22f84209763e891e8.
2013-01-11 15:51:28 +05:30
Author Name
5dd14f322c
<message>
2013-01-11 15:47:23 +05:30
Sebastien Goasguen
b2ca9fe7b0
Added Marvin building docs to dev guide
2013-01-11 10:57:00 +01:00
Sebastien Goasguen
5f19c45e04
Added Marvin building docs in developer guide
2013-01-11 10:55:37 +01:00
Jessica Tomechak
2bc3b5cc6f
Docs. CLOUDSTACK-959. A sub-heading was inadvertently left out of the System Service Offerings section of documentation. Adding the section "Creating a New System Service Offering".
2013-01-11 01:30:13 -08:00
Alex Huang
d6f44a4d6a
merged from master
2013-01-10 15:55:42 -08:00
Joe Brockmeier
ffcc6d781e
CLOUDSTACK-683: Fixed missing image in Accessing VM Section
2013-01-10 16:01:02 -06:00
Sebastien Goasguen
09b68ce13f
Improvements to AWS installation, configuration and use in installation guide
2013-01-09 13:56:24 -06:00
Alex Huang
b6c56736e5
merge from master
2013-01-09 05:20:36 -08:00
Rohit Yadav
a0dbbad253
Merge branch 'master' into api_refactoring
2013-01-08 18:55:05 -08:00
radhikap
aa9ccf7302
fix for CLOUDSTACK-481
...
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
2013-01-08 15:04:19 -06:00
Alex Huang
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
Rohit Yadav
85e73a640e
Merge branch 'master' into api_refactoring
...
Conflicts:
client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 23:27:42 -08:00
Gavin Lee
8cf2cb1f4e
[DOC]Delete duplicated, mis-spelling xml files.
2013-01-04 10:25:34 +08:00
Rohit Yadav
296b49c2f8
Merge branch 'master' into test-merge-api
...
Conflicts:
api/src/com/cloud/agent/api/BackupSnapshotCommand.java
api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/resource/ResourceService.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/storage/SnapshotVO.java
pom.xml
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
John Kinsella
5658fc4249
CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references
...
Tried to remove any references to license agreements, EULA, Citrix,
or CloudPlatform. Tested through devcloud, didn't see decreased UI
functionality.
2012-12-16 20:39:03 -08:00
Sebastien Goasguen
6507055ba1
Change in Dev Guide to add Maven and Tools Chapter
2012-12-15 00:29:12 -06:00
Pranav Saxena
b5eec20f5e
Revert "Docs for Elastic IP and display name in vCenter"
...
This reverts commit 41dd38c86b0ac3f2c235c06162a5c12cf930aa8e.
2012-12-13 05:22:20 +05:30
Joe Brockmeier
561dccfe9d
Fixing an oops, left out a tag...
2012-12-12 11:21:14 -06:00
Radhika PC
41dd38c86b
Docs for Elastic IP and display name in vCenter
2012-12-13 04:05:49 +05:30
Sebastien Goasguen
400d29be85
Modify docs for transifex translation
2012-12-09 11:30:18 -06:00
Sebastien Goasguen
18d7595292
Prepare docs for transifex translation
2012-12-09 11:30:18 -06:00
Joe Brockmeier
2bd877616b
CLOUDSTACK-400: documening procedure to update MySQL password. Also added a few xrefs in other documents that were missing them.
2012-12-09 11:11:22 -06:00
Joe Brockmeier
9d6bdf9cf9
CLOUDSTACK-389: Added language to clear up confusion about iSCSI only.
2012-12-09 10:12:34 -06:00
Joe Brockmeier
ac50c2699c
CLOUDSTACK-395: Added xrefs to about-primary-storage and about-secondary-storage
2012-12-07 13:48:42 -06:00
Joe Brockmeier
3ab8a65a39
removing garbage files
2012-12-07 08:49:18 -06:00
Joe Brockmeier
4fe6494881
CLOUDSTACK-480: Adding mention to install nfs-kernel-server to Install Guide
2012-12-07 08:46:32 -06:00
Rohit Yadav
6fc3bc3760
api_refactor: refactor vpn and vm apis
...
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
Gavin Lee
df8990eae6
Rename cloudplatform-api.xml to cloudstack-api.xml
...
Change CloudPlatform to &PRODUCT;
2012-11-28 12:45:54 +08:00
Sebastien Goasguen
45dd833b2e
CS-547
...
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
2012-11-28 10:21:17 +08:00
David Nalley
65e39f6666
cleaning up docs/runbook/tmp and adding gitignore entries for that as well
2012-11-19 09:23:58 -05:00
David Nalley
35666a5266
cleaning up docs temp, publish directories - adding gitignore entries for them for the future
2012-11-19 09:11:03 -05:00
David Nalley
d15c506571
CLOUDSTACK-397 - removed image that wasn't conveying networking layout properly
2012-11-16 18:50:45 -05:00
David Nalley
bd904df022
CLOUDSTACK-467 putting in the correct link to API documentation
2012-11-16 18:08:02 -05:00
Gavin Lee
ddca805912
Docbook xml for additional installation options
2012-11-09 13:55:27 +08:00
Joe Brockmeier
d8e31c7a90
Revised en-US/network-setup.xml to include the correct file.
2012-11-08 00:12:28 -06:00
Joe Brockmeier
079de08194
Commented out missing file.
2012-11-07 23:53:53 -06:00
Radhika PC
35dcda2e88
CLOUDSTACK-403: New Doc file on About password and key encryption. In the Install guide, fixed references to the same section.
2012-11-07 23:29:55 -06:00
Radhika PC
ffdf19dc2c
fix for review comments-cloudstack-403
...
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
2012-11-07 23:13:27 -06:00
Radhika PC
5722827c1b
fix for cloudstack-403
...
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
2012-11-07 23:11:09 -06:00
name=Radhika PC
8e3532825b
CLOUDSTACK-444 Fix from Radhika PC against docs, adds network setup in the install guide.
2012-11-07 11:46:06 -06:00
Radhika PC
cb3d8872c6
fix for CLOUDSTACK-444
...
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
2012-11-07 11:40:51 -06:00
Jessica Tomechak
c2ccc52c4d
Docs. Remove inaccurate CloudStack software version number from table heading.
2012-11-05 12:51:58 -08:00
Jessica Tomechak
514a7e31d4
Docs. CLOUDSTACK-134. Copying vhd-util is required only when XenServer is used.
2012-11-05 12:51:56 -08:00
Hugo Trippaers
fe7b28ea0b
Summary: Fixed typo in the documentation, reported by Roeland Kuipers
2012-11-05 15:23:48 +01:00
Wido den Hollander
4cb9e6d7d4
docs: Change filename of Deb repository file
...
These files should end with .list, otherwise Apt won't pick them up.
2012-11-05 10:23:09 +01:00
