49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
|
commit 7f95c09d53cae9c5a6e2348c2d4ad7fd5e59affe
|
||
|
|
Author: Gao,Yan <ygao@suse.com>
|
||
|
|
Date: Tue Dec 13 14:15:01 2011 +0800
|
||
|
|
|
||
|
|
Meidum: Core: Move several new fields since v1.1.6 to the end of the data types for ABI compliance
|
||
|
|
|
||
|
|
diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
|
||
|
|
index 1110248..8b00e09 100644
|
||
|
|
--- a/include/crm/pengine/status.h
|
||
|
|
+++ b/include/crm/pengine/status.h
|
||
|
|
@@ -90,7 +90,6 @@ typedef struct pe_working_set_s {
|
||
|
|
GHashTable *config_hash;
|
||
|
|
GHashTable *domains;
|
||
|
|
GHashTable *tickets;
|
||
|
|
- GHashTable *template_rsc_sets;
|
||
|
|
|
||
|
|
GListPtr nodes;
|
||
|
|
GListPtr resources;
|
||
|
|
@@ -113,6 +112,8 @@ typedef struct pe_working_set_s {
|
||
|
|
/* final output */
|
||
|
|
xmlNode *graph;
|
||
|
|
|
||
|
|
+ GHashTable *template_rsc_sets;
|
||
|
|
+
|
||
|
|
} pe_working_set_t;
|
||
|
|
|
||
|
|
struct node_shared_s {
|
||
|
|
diff --git a/include/crm/transition.h b/include/crm/transition.h
|
||
|
|
index 22f095f..02eff03 100644
|
||
|
|
--- a/include/crm/transition.h
|
||
|
|
+++ b/include/crm/transition.h
|
||
|
|
@@ -96,7 +96,6 @@ typedef struct crm_graph_s {
|
||
|
|
int num_synapses;
|
||
|
|
|
||
|
|
int batch_limit;
|
||
|
|
- int migration_limit;
|
||
|
|
int network_delay;
|
||
|
|
int stonith_timeout;
|
||
|
|
int transition_timeout;
|
||
|
|
@@ -108,6 +107,8 @@ typedef struct crm_graph_s {
|
||
|
|
int incomplete;
|
||
|
|
|
||
|
|
GListPtr synapses; /* synpase_t* */
|
||
|
|
+
|
||
|
|
+ int migration_limit;
|
||
|
|
GHashTable *migrating;
|
||
|
|
|
||
|
|
} crm_graph_t;
|