From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7912 invoked by alias); 8 Jul 2009 16:40:59 -0000 Received: (qmail 7901 invoked by alias); 8 Jul 2009 16:40:58 -0000 X-SWARE-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL,BAYES_50,J_CHICKENPOX_36,SPF_HELO_PASS X-Spam-Status: No, hits=-0.5 required=5.0 tests=AWL,BAYES_50,J_CHICKENPOX_36,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - config: Fix misnamed statusmax -> status_child_max To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: b150a76a70d1a5ed76ab0ec11819cb72919c3301 X-Git-Newrev: 5713c7a68e9c1b22fb54b19faf17af3dc00ea6d9 From: Lon Hohberger Message-Id: <20090708163703.8EBCF1201FB@lists.fedorahosted.org> Date: Wed, 08 Jul 2009 16:40:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00019.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5713c7a68e9c1b22fb54b19faf17af3dc00ea6d9 Commit: 5713c7a68e9c1b22fb54b19faf17af3dc00ea6d9 Parent: b150a76a70d1a5ed76ab0ec11819cb72919c3301 Author: Lon Hohberger AuthorDate: Wed Jul 8 12:35:12 2009 -0400 Committer: Lon Hohberger CommitterDate: Wed Jul 8 12:35:12 2009 -0400 config: Fix misnamed statusmax -> status_child_max Signed-off-by: Lon Hohberger --- config/plugins/ldap/99cluster.ldif | 4 ++-- config/plugins/ldap/ldap-base.csv | 2 +- config/tools/xml/cluster.rng | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index c23af02..72e2d57 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -529,7 +529,7 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.88 NAME 'rhcsStatusmax' + 1.3.6.1.4.1.2312.8.1.1.88 NAME 'rhcsStatus-child-max' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE @@ -1432,7 +1432,7 @@ objectClasses: ( ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.21 NAME 'rhcsRm' SUP top STRUCTURAL - MAY( rhcsLog-facility $ rhcsCentral-processing $ rhcsTransition-throttling $ rhcsStatus-poll-interval $ rhcsStatusmax $ rhcsLog-level ) + MAY( rhcsLog-facility $ rhcsCentral-processing $ rhcsTransition-throttling $ rhcsStatus-poll-interval $ rhcsStatus-child-max $ rhcsLog-level ) ) ### Placeholder for rhcsFailoverdomains ### This object class currently has no attributes diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv index b90c39f..5dfde80 100644 --- a/config/plugins/ldap/ldap-base.csv +++ b/config/plugins/ldap/ldap-base.csv @@ -107,7 +107,7 @@ attr,rhcsSecauth,secauth,85 attr,rhcsKeyfile,keyfile,86 obj,rhcsRm,rm,21 attr,rhcsLog-level,log_level,87 -attr,rhcsStatusmax,statusmax,88 +attr,rhcsStatus-child-max,status_child_max,88 attr,rhcsStatus-poll-interval,status_poll_interval,89 attr,rhcsTransition-throttling,transition_throttling,90 attr,rhcsCentral-processing,central_processing,91 diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng index 56d4ff6..ad5ef0f 100644 --- a/config/tools/xml/cluster.rng +++ b/config/tools/xml/cluster.rng @@ -815,7 +815,7 @@ To validate your cluster.conf against this schema, run: - +