Merge 2.5.x changes into trunk.

This commit is contained in:
b1v1r
2009-05-21 06:18:18 +00:00
parent 944a08822f
commit ffc5d968e6
4 changed files with 93 additions and 3 deletions

View File

@@ -2120,6 +2120,7 @@ void msre_engine_register_default_actions(msre_engine *engine) {
);
/* phase */
/* ENH: This should be ACTION_NON_DISRUPTIVE or ACTION_FLOW??? */
msre_engine_action_register(engine,
"phase",
ACTION_DISRUPTIVE,
@@ -2354,6 +2355,7 @@ void msre_engine_register_default_actions(msre_engine *engine) {
);
/* tag */
/* ENH: This should be ACTION_METADATA??? */
msre_engine_action_register(engine,
"tag",
ACTION_NON_DISRUPTIVE,