cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Nalley <da...@gnsa.us>
Subject Re: [01/50] git commit: updated refs/heads/master to 1290e10
Date Tue, 23 Sep 2014 18:31:44 GMT
Where was the merge request for this huge merge to master? (it was at
50 commit emails, when it stopped sending, )
We have passed feature freeze for 4.5.0, so I am confused as why this
was merged. Is there a reason not to revert all of this?

--David

On Mon, Sep 22, 2014 at 3:44 PM,  <bhaisaab@apache.org> wrote:
> Repository: cloudstack
> Updated Branches:
>   refs/heads/master a6ee4112a -> 1290e1010
>
>
> CLOUDSTACK-7143: move fix_acpid to its own file
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5627b67f
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5627b67f
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5627b67f
>
> Branch: refs/heads/master
> Commit: 5627b67ff3a6af70949ee1622b3e5a572d39a0b7
> Parents: 6a688a0
> Author: Leo Simons <lsimons@schubergphilis.com>
> Authored: Mon Jul 21 11:19:03 2014 +0200
> Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
> Committed: Mon Sep 22 21:31:35 2014 +0200
>
> ----------------------------------------------------------------------
>  .../definitions/systemvmtemplate/configure_acpid.sh  | 15 +++++++++++++++
>  .../definitions/systemvmtemplate/definition.rb       |  1 +
>  .../definitions/systemvmtemplate/postinstall.sh      | 15 ---------------
>  3 files changed, 16 insertions(+), 15 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5627b67f/tools/appliance/definitions/systemvmtemplate/configure_acpid.sh
> ----------------------------------------------------------------------
> diff --git a/tools/appliance/definitions/systemvmtemplate/configure_acpid.sh b/tools/appliance/definitions/systemvmtemplate/configure_acpid.sh
> new file mode 100644
> index 0000000..70abe30
> --- /dev/null
> +++ b/tools/appliance/definitions/systemvmtemplate/configure_acpid.sh
> @@ -0,0 +1,15 @@
> +fix_acpid() {
> +  # Fix acpid
> +  mkdir -p /etc/acpi/events
> +  cat >> /etc/acpi/events/power << EOF
> +event=button/power.*
> +action=/usr/local/sbin/power.sh "%e"
> +EOF
> +  cat >> /usr/local/sbin/power.sh << EOF
> +#!/bin/bash
> +/sbin/poweroff
> +EOF
> +  chmod a+x /usr/local/sbin/power.sh
> +}
> +
> +fix_acpid
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5627b67f/tools/appliance/definitions/systemvmtemplate/definition.rb
> ----------------------------------------------------------------------
> diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb b/tools/appliance/definitions/systemvmtemplate/definition.rb
> index be0b403..a2eb82b 100644
> --- a/tools/appliance/definitions/systemvmtemplate/definition.rb
> +++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
> @@ -63,6 +63,7 @@ config = {
>          'configure_locale.sh',
>          'configure_login.sh',
>          'postinstall.sh',
> +        'configure_acpid.sh',
>          'cleanup.sh',
>          'configure_networking.sh',
>          'zerodisk.sh'
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5627b67f/tools/appliance/definitions/systemvmtemplate/postinstall.sh
> ----------------------------------------------------------------------
> diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
> index 893b521..f2ce1ae 100644
> --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
> +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
> @@ -116,20 +116,6 @@ nameserver 8.8.4.4
>  EOF
>  }
>
> -fix_acpid() {
> -  # Fix acpid
> -  mkdir -p /etc/acpi/events
> -  cat >> /etc/acpi/events/power << EOF
> -event=button/power.*
> -action=/usr/local/sbin/power.sh "%e"
> -EOF
> -  cat >> /usr/local/sbin/power.sh << EOF
> -#!/bin/bash
> -/sbin/poweroff
> -EOF
> -  chmod a+x /usr/local/sbin/power.sh
> -}
> -
>  fix_hostname() {
>    # Fix hostname in openssh-server generated keys
>    sed -i "s/root@\(.*\)$/root@$HOSTNAME/g" /etc/ssh/ssh_host_*.pub
> @@ -164,7 +150,6 @@ EOF
>
>  do_fixes() {
>    fix_nameserver
> -  fix_acpid
>    fix_hostname
>    fix_conntrackd
>    fix_vhdutil
>

Mime
View raw message