Skip to content

Commit

Permalink
Merge pull request #601 from jnpkrn/fix-xml.c-memleak
Browse files Browse the repository at this point in the history
Fix xml.c memleak + doc: fix typos in index terms
  • Loading branch information
beekhof committed Oct 22, 2014
2 parents ff52d84 + 40b8d98 commit 118ac30
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
12 changes: 6 additions & 6 deletions doc/Pacemaker_Explained/en-US/Ch-Options.txt
Expand Up @@ -89,22 +89,22 @@ cluster cannot start resources or fence other nodes. See
+no-quorum-policy+ below.

| dc-version |
indexterm:[dc-version,Cluster Peroperty]
indexterm:[Cluster,Peroperty,dc-version]
indexterm:[dc-version,Cluster Property]
indexterm:[Cluster,Property,dc-version]
Version of Pacemaker on the cluster's DC.

Often includes the hash which identifies the exact Git changeset it
was built from. Used for diagnostic purposes.

| cluster-infrastructure |
indexterm:[cluster-infrastructure,Cluster Peroperty]
indexterm:[Cluster,Peroperty,cluster-infrastructure]
indexterm:[cluster-infrastructure,Cluster Property]
indexterm:[Cluster,Property,cluster-infrastructure]
The messaging stack on which Pacemaker is currently running.
Used for informational and diagnostic purposes.

| expected-quorum-votes |
indexterm:[expected-quorum-votes,Cluster Peroperty]
indexterm:[Cluster,Peroperty,expected-quorum-votes]
indexterm:[expected-quorum-votes,Cluster Property]
indexterm:[Cluster,Property,expected-quorum-votes]
The number of nodes expected to be in the cluster

Used to calculate quorum in Corosync 1.x (not CMAN) based clusters.
Expand Down
1 change: 1 addition & 0 deletions lib/common/xml.c
Expand Up @@ -386,6 +386,7 @@ static int __xml_build_schema_list(void)
xslt = get_schema_path(NULL, transform);
if(stat(xslt, &s) != 0) {
crm_err("Transform %s not found", xslt);
free(xslt);
__xml_schema_add(2, version, NULL, NULL, NULL, -1);
break;
} else {
Expand Down

0 comments on commit 118ac30

Please sign in to comment.