cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-987: Added missing sections for working with snapshots.
Date Thu, 07 Mar 2013 06:58:23 GMT
Updated Branches:
  refs/heads/4.1 07ff1195d -> a81850261


CLOUDSTACK-987: Added missing sections for working with snapshots.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a8185026
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a8185026
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a8185026

Branch: refs/heads/4.1
Commit: a818502619c81a91611731dc64dd110d81896944
Parents: 07ff119
Author: Joe Brockmeier <jzb@zonker.net>
Authored: Thu Mar 7 00:58:07 2013 -0600
Committer: Joe Brockmeier <jzb@zonker.net>
Committed: Thu Mar 7 00:58:07 2013 -0600

----------------------------------------------------------------------
 docs/en-US/globally-configured-limits.xml |    2 +-
 docs/en-US/working-with-snapshots.xml     |    4 ++++
 docs/en-US/working-with-usage-data.xml    |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a8185026/docs/en-US/globally-configured-limits.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/globally-configured-limits.xml b/docs/en-US/globally-configured-limits.xml
index 48a91f1..ac71112 100644
--- a/docs/en-US/globally-configured-limits.xml
+++ b/docs/en-US/globally-configured-limits.xml
@@ -22,7 +22,7 @@
  under the License.
 -->
 
-<section id="globally-configured-limit">
+<section id="globally-configured-limits">
     <title>Globally Configured Limits</title>
     <para>In a zone, the guest virtual network has a 24 bit CIDR by default. This limits
the guest virtual network to 254 running instances. It can be adjusted as needed, but this
must be done before any instances are created in the zone. For example, 10.1.1.0/22 would
provide for ~1000 addresses.</para>
     <para>The following table lists limits set in the Global Configuration:</para>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a8185026/docs/en-US/working-with-snapshots.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-snapshots.xml b/docs/en-US/working-with-snapshots.xml
index a381707..b984439 100644
--- a/docs/en-US/working-with-snapshots.xml
+++ b/docs/en-US/working-with-snapshots.xml
@@ -29,4 +29,8 @@
 	<para>Users can create snapshots manually or by setting up automatic recurring snapshot
policies. Users can also create disk volumes from snapshots, which may be attached to a VM
like any other disk volume. Snapshots of both root disks and data disks are supported. However,
&PRODUCT; does not currently support booting a VM from a recovered root disk. A disk recovered
from snapshot of a root disk is treated as a regular data disk; the data on recovered disk
can be accessed by attaching the disk to a VM.</para>
 	<para>A completed snapshot is copied from primary storage to secondary storage, where
it is stored until deleted or purged by newer snapshot.</para>
     <xi:include href="snapshot-throttling.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
+    <xi:include href="automatic-snapshot-creation-retention.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/> 
+    <xi:include href="incremental-snapshots-backup.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/> 
+    <xi:include href="volume-status.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

+    <xi:include href="snapshot-restore.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
 </section>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a8185026/docs/en-US/working-with-usage-data.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/working-with-usage-data.xml b/docs/en-US/working-with-usage-data.xml
index 56a929f..5324617 100644
--- a/docs/en-US/working-with-usage-data.xml
+++ b/docs/en-US/working-with-usage-data.xml
@@ -31,4 +31,5 @@
     <xi:include href="usage-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
     <xi:include href="example-response-from-listUsageRecords.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
     <xi:include href="dates-in-usage-record.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
+    <xi:include href="globally-configured-limits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"
/>
 </chapter>


Mime
View raw message