Merge pull request #65 from timohl/master

timohl · web-flow · commit 306444036879 · 2018-05-14T15:49:14.000+02:00
Added missing comma in result types.
diff --git a/src/message/migfra/task.cpp b/src/message/migfra/task.cpp
@@ -72,7 +72,7 @@ std::string Task_container::type(bool enable_result_format) const
 {
 	std::array<std::string, 8> types;
 	if (enable_result_format)
-		types = {{"vm started", "vm stopped", "vm migrated", "node evacuated" "vm repinned", "vm suspended", "vm resumed", "quit"}};
+		types = {{"vm started", "vm stopped", "vm migrated", "node evacuated", "vm repinned", "vm suspended", "vm resumed", "quit"}};
 	else
 		types = {{"start vm", "stop vm", "migrate vm", "evacuate node", "repin vm", "suspend vm", "resume vm", "quit"}};
 	if (tasks.empty())

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ std::string Task_container::type(bool enable_result_format) const`
`72`	`72`	`{`
`73`	`73`	`std::array<std::string, 8> types;`
`74`	`74`	`if (enable_result_format)`
`75`		`- types = {{"vm started", "vm stopped", "vm migrated", "node evacuated" "vm repinned", "vm suspended", "vm resumed", "quit"}};`
	`75`	`+ types = {{"vm started", "vm stopped", "vm migrated", "node evacuated", "vm repinned", "vm suspended", "vm resumed", "quit"}};`
`76`	`76`	`else`
`77`	`77`	`types = {{"start vm", "stop vm", "migrate vm", "evacuate node", "repin vm", "suspend vm", "resume vm", "quit"}};`
`78`	`78`	`if (tasks.empty())`