[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-35-g5ca1096

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-35-g5ca1096

[rohara]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=5ca10968fb04d0ea485d7f52451d266ec581aad2

The branch, RHEL5 has been updated
       via  5ca10968fb04d0ea485d7f52451d266ec581aad2 (commit)
      from  d5f18f291be1d57a31b972810c7a9f00c2c92e59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5ca10968fb04d0ea485d7f52451d266ec581aad2
Author: Ryan O'Hara <rohara@redhat.com>
Date:   Mon Apr 7 11:16:55 2008 -0500

    BZ 441323 : Redirect stderr to /dev/null when getting list of devices.

-----------------------------------------------------------------------

Summary of changes:
 fence/agents/scsi/fence_scsi.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
index 51c75ae..5074af3 100755
--- a/fence/agents/scsi/fence_scsi.pl
+++ b/fence/agents/scsi/fence_scsi.pl
@@ -280,7 +280,7 @@ sub get_scsi_devices
     my ($in, $out, $err);
 
     my $cmd = "vgs --config 'global { locking_type = 0 }'" .
-              "    --noheadings --separator : -o vg_attr,pv_name";
+              "    --noheadings --separator : -o vg_attr,pv_name 2> /dev/null";
 
     my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
 


hooks/post-receive
--
Cluster Project

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-35-g5ca1096

[Fabio M. Di Nitto]

Hi Ryan,

it looks like that fence_scsi.pl in master/STABLE2 have somehow diverged 
from RHEL* branches.

In which direction should we merge the changes?

Thanks
Fabio

On Mon, 7 Apr 2008, rohara at sourceware.org wrote:

> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "Cluster Project".
>
> http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=5ca10968fb04d0ea485d7f52451d266ec581aad2
>
> The branch, RHEL5 has been updated
>       via  5ca10968fb04d0ea485d7f52451d266ec581aad2 (commit)
>      from  d5f18f291be1d57a31b972810c7a9f00c2c92e59 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> commit 5ca10968fb04d0ea485d7f52451d266ec581aad2
> Author: Ryan O'Hara <rohara@redhat.com>
> Date:   Mon Apr 7 11:16:55 2008 -0500
>
>    BZ 441323 : Redirect stderr to /dev/null when getting list of devices.
>
> -----------------------------------------------------------------------
>
> Summary of changes:
> fence/agents/scsi/fence_scsi.pl |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
> index 51c75ae..5074af3 100755
> --- a/fence/agents/scsi/fence_scsi.pl
> +++ b/fence/agents/scsi/fence_scsi.pl
> @@ -280,7 +280,7 @@ sub get_scsi_devices
>     my ($in, $out, $err);
>
>     my $cmd = "vgs --config 'global { locking_type = 0 }'" .
> -              "    --noheadings --separator : -o vg_attr,pv_name";
> +              "    --noheadings --separator : -o vg_attr,pv_name 2> /dev/null";
>
>     my $pid = open3($in, $out, $err, $cmd) or die "$!\n";
>
>
>
> hooks/post-receive
> --
> Cluster Project
>


--
I'm going to make him an offer he can't refuse.

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-35-g5ca1096

[Fabio M. Di Nitto]

On Mon, 7 Apr 2008, Fabio M. Di Nitto wrote:

>
> Hi Ryan,
>
> it looks like that fence_scsi.pl in master/STABLE2 have somehow diverged from 
> RHEL* branches.
>
> In which direction should we merge the changes?
>
> Thanks
> Fabio

I merged the RHEL5 branch into master and STABLE2 like we agreed. From now 
on you should be able to just edit one of them and cherry pick into the 
others.

Fabio

--
I'm going to make him an offer he can't refuse.