mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
This commit is contained in:
commit
49919bcc6f
@ -174,6 +174,7 @@
|
||||
<programlisting><prompt>#</prompt> <command>apt-get</command> update
|
||||
<prompt>#</prompt> <command>apt-get</command> upgrade cloud-*</programlisting>
|
||||
</para>
|
||||
<para>You will, of course, have to agree to the changes suggested by Yum or APT.</para>
|
||||
<note>
|
||||
<para>If the upgrade output includes a message similar to the following, then some
|
||||
custom content was found in your old components.xml, and you need to merge the two
|
||||
@ -619,6 +620,7 @@
|
||||
<programlisting><prompt>#</prompt> <command>apt-get</command> update
|
||||
<prompt>#</prompt> <command>apt-get</command> upgrade cloud-*</programlisting>
|
||||
</para>
|
||||
<para>You will, of course, have to agree to the changes suggested by Yum or APT.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>If you have made changes to your existing copy of the file components.xml in your
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
<orderedlist>
|
||||
<listitem><para>Open your favorite Web browser and go to this URL. Substitute the IP address of your own Management Server:</para>
|
||||
<programlisting>http://<management-server-ip-address>:8080/client</programlisting>
|
||||
<para>On a fresh Management Server installation, a guided tour splash screen appears. On later visits, you’ll see a login screen where you can enter a user ID and password and proceed to your Dashboard.</para>
|
||||
<para>After logging into a fresh Management Server installation, a guided tour splash screen appears. On later visits, you’ll be taken directly into the Dashboard.</para>
|
||||
</listitem>
|
||||
<listitem><para>If you see the first-time splash screen, choose one of the following.</para>
|
||||
<itemizedlist>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<listitem><para>First use vCenter to exit the vCenter maintenance mode.</para>
|
||||
<para>This makes the host ready for &PRODUCT; to reactivate it.</para></listitem>
|
||||
<listitem><para>Then use &PRODUCT;'s administrator UI to cancel the &PRODUCT; maintenance mode</para>
|
||||
<para>When the host comes back online, the VMs that were migrated off of it are migrated back to it and new VMs can be added.</para></listitem>
|
||||
<para>When the host comes back online, the VMs that were migrated off of it may be migrated back to it manually and new VMs can be added.</para></listitem>
|
||||
</orderedlist></listitem>
|
||||
</orderedlist>
|
||||
</section>
|
||||
|
||||
@ -54,9 +54,9 @@
|
||||
<section id="sect-source-verify-md5">
|
||||
<title>MD5</title>
|
||||
<para>
|
||||
In addition to the cryptographic signature, the &PRODUCT; provides a number
|
||||
of cryptographic hashes to aid in assurance of validity of the downloaded
|
||||
release. You can verify this hash by executing the following command:
|
||||
In addition to the cryptographic signature, &PRODUCT; has an MD5 checksum
|
||||
that you can use to verify the download matches the release.
|
||||
You can verify this hash by executing the following command:
|
||||
<programlisting><prompt>$</prompt> <command>gpg</command> --print-md MD5 apache-cloudstack-4.0.0-incubating-src.tar.bz2 | <command>diff</command> - apache-cloudstack-4.0.0-incubating-src.tar.bz2.md5</programlisting>
|
||||
</para>
|
||||
<para>
|
||||
|
||||
@ -7266,8 +7266,9 @@ div.panel.ui-dialog div.list-view div.fixed-header {
|
||||
border-radius: 5px;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
width: 74px;
|
||||
text-indent: 0px;
|
||||
text-align: center;
|
||||
padding: 6px 9px 4px 0px;
|
||||
padding: 6px 0px 4px;
|
||||
background: url(../images/bg-gradients.png) repeat-x 0px -220px;
|
||||
/*+placement:shift 4px 0px;*/
|
||||
position: relative;
|
||||
@ -7389,10 +7390,18 @@ div.panel.ui-dialog div.list-view div.fixed-header {
|
||||
border-left: none;
|
||||
border-right: 1px solid #CFC9C9;
|
||||
height: 15px;
|
||||
overflow: hidden;
|
||||
overflow: auto;
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
.multi-edit .data .data-body .data-item > table tbody tr td span {
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
width: 70px;
|
||||
display: block;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.multi-edit .data .data-body .data-item table tbody tr td.blank {
|
||||
}
|
||||
|
||||
@ -7437,6 +7446,7 @@ div.panel.ui-dialog div.list-view div.fixed-header {
|
||||
.multi-edit .data .data-body .data-item tr td .expand {
|
||||
width: 14px;
|
||||
height: 15px;
|
||||
display: block;
|
||||
cursor: pointer;
|
||||
background: #FFFFFF url(../images/sprites.png) -541px -499px;
|
||||
border: 1px solid #D0D0D0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user