commit 75a1451ef00947f7689d42d59efa92503485b8a3 Author: Andrew Beekhof Date: Tue Apr 1 19:31:28 2014 +1100 Refactor: PE: Fix comments and formatting for pe_ordering enum (cherry picked from commit 43596dcacadbdd1199e1238052105914311b151c) Conflicts: include/crm/pengine/status.h diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h index 158a562..c81566a 100644 --- a/include/crm/pengine/status.h +++ b/include/crm/pengine/status.h @@ -319,28 +319,28 @@ enum pe_link_state { /* *INDENT-OFF* */ enum pe_ordering { - pe_order_none = 0x0, /* deleted */ - pe_order_optional = 0x1, /* pure ordering, nothing implied */ + pe_order_none = 0x0, /* deleted */ + pe_order_optional = 0x1, /* pure ordering, nothing implied */ - pe_order_implies_first = 0x10, /* If 'first' is required, ensure 'then' is too */ - pe_order_implies_then = 0x20, /* If 'then' is required, ensure 'first' is too */ + pe_order_implies_first = 0x10, /* If 'then' is required, ensure 'first' is too */ + pe_order_implies_then = 0x20, /* If 'first' is required, ensure 'then' is too */ pe_order_implies_first_master = 0x40, /* Imply 'first' is required when 'then' is required and then's rsc holds Master role. */ pe_order_runnable_left = 0x100, /* 'then' requires 'first' to be runnable */ pe_order_restart = 0x1000, /* 'then' is runnable if 'first' is optional or runnable */ - pe_order_stonith_stop = 0x2000, /* only applies if the action is non-pseudo */ - pe_order_serialize_only = 0x4000, /* serialize */ + pe_order_stonith_stop = 0x2000, /* only applies if the action is non-pseudo */ + pe_order_serialize_only = 0x4000, /* serialize */ pe_order_implies_first_printed = 0x10000, /* Like ..implies_first but only ensures 'first' is printed, not manditory */ - pe_order_implies_then_printed = 0x20000, /* Like ..implies_then but only ensures 'then' is printed, not manditory */ + pe_order_implies_then_printed = 0x20000, /* Like ..implies_then but only ensures 'then' is printed, not manditory */ - pe_order_asymmetrical = 0x100000, /* Indicates asymmetrical one way ordering constraint. */ - pe_order_load = 0x200000, /* Only relevant if... */ - pe_order_one_or_more = 0x400000, /* 'then' is only runnable if one or more of it's dependancies are too */ + pe_order_asymmetrical = 0x100000, /* Indicates asymmetrical one way ordering constraint. */ + pe_order_load = 0x200000, /* Only relevant if... */ + pe_order_one_or_more = 0x400000, /* 'then' is only runnable if one or more of it's dependancies are too */ pe_order_anti_colocation = 0x800000, - pe_order_trace = 0x4000000 /* test marker */ + pe_order_trace = 0x4000000, /* test marker */ }; /* *INDENT-ON* */