summaryrefslogtreecommitdiff
path: root/doc
diff options
authorThomas Goirand <zigo@debian.org>2015-10-15 22:27:37 +0000
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2015-10-16 04:20:34 +0000
commitbf2067db8c46b8842569fa37ba675f3e1d4246b8 (patch)
tree0ef2e81cf346ab71f68e14120562eccb2de55583 /doc
parentebeeea8f7893f20d811b5ac6cf1137787419cccd (diff)
1.7.1-1 (patches unapplied)import/1.7.1-1
Imported using git-ubuntu import.
Notes
Notes: [ Corey Bryant ] * New upstream release. [ Thomas Goirand ] * Uploading to unstable. * Fixed watch file to use github tag.
Diffstat (limited to 'doc')
-rw-r--r--doc/source/command-objects/image.rst60
-rw-r--r--doc/source/developing.rst2
-rw-r--r--doc/source/releases.rst6
3 files changed, 66 insertions, 2 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 8e44f51..d2698b0 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -212,7 +212,7 @@ Save an image locally
image set
---------
-*Only supported for Image v1*
+*Image v1, v2*
Set image properties
@@ -271,6 +271,8 @@ Set image properties
Size of image data (in bytes)
+ *Image version 1 only.*
+
.. option:: --protected
Prevent image from being deleted
@@ -291,38 +293,94 @@ Set image properties
Upload image to this store
+ *Image version 1 only.*
+
.. option:: --location <image-url>
Download image from an existing URL
+ *Image version 1 only.*
+
.. option:: --copy-from <image-url>
Copy image from the data store (similar to --location)
+ *Image version 1 only.*
+
.. option:: --file <file>
Upload image from local file
+ *Image version 1 only.*
+
.. option:: --volume <volume>
Update image with a volume
+ *Image version 1 only.*
+
.. option:: --force
Force image update if volume is in use (only meaningful with --volume)
+ *Image version 1 only.*
+
.. option:: --checksum <checksum>
Image hash used for verification
+ *Image version 1 only.*
+
.. option:: --stdin
Allow to read image data from standard input
+ *Image version 1 only.*
+
.. option:: --property <key=value>
Set a property on this image (repeat for multiple values)
+ *Image version 1 only.*
+
+.. option:: --architecture <architecture>
+
+ Operating system Architecture
+
+ .. versionadded:: 2
+
+.. option:: --ramdisk-id <ramdisk-id>
+
+ ID of image stored in Glance that should be used as
+ the ramdisk when booting an AMI-style image
+
+ .. versionadded:: 2
+
+.. option:: --os-distro <os-distro>
+
+ Common name of operating system distribution
+
+ .. versionadded:: 2
+
+.. option:: --os-version <os-version>
+
+ Operating system version as specified by the distributor
+
+ .. versionadded:: 2
+
+.. option:: --kernel-id <kernel-id>
+
+ ID of image in Glance that should be used as the
+ kernel when booting an AMI-style image
+
+ .. versionadded:: 2
+
+.. option:: --instance-uuid <instance_uuid>
+
+ ID of instance used to create this image
+
+ .. versionadded:: 2
+
.. describe:: <image>
Image to modify (name or ID)
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index 90f0900..c41fbf3 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -113,4 +113,4 @@ or
.. code-block:: bash
- $ pip install -e
+ $ pip install -e .
diff --git a/doc/source/releases.rst b/doc/source/releases.rst
index 526b163..582f584 100644
--- a/doc/source/releases.rst
+++ b/doc/source/releases.rst
@@ -2,6 +2,12 @@
Release Notes
=============
+1.7.1 (30 Sep 2015)
+===================
+
+* Image v2 lookup issues
+ Bug `1501362 <https://bugs.launchpad.net/bugs/1501362>`_
+
1.7.0 (22 Sep 2015)
===================