Revision 9c784fb3 lib/client/gnt_instance.py

b/lib/client/gnt_instance.py
1338 1338
                                   force=opts.force,
1339 1339
                                   wait_for_sync=opts.wait_for_sync,
1340 1340
                                   offline=offline,
1341
                                   conflicts_check=opts.conflicts_check,
1341 1342
                                   ignore_ipolicy=opts.ignore_ipolicy)
1342 1343

  
1343 1344
  # even if here we process the result, we allow submit only
......
1527 1528
    [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT, SUBMIT_OPT,
1528 1529
     DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT,
1529 1530
     OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT, OFFLINE_INST_OPT,
1530
     ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT],
1531
     ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
1532
     NOCONFLICTSCHECK_OPT],
1531 1533
    "<instance>", "Alters the parameters of an instance"),
1532 1534
  "shutdown": (
1533 1535
    GenericManyOps("shutdown", _ShutdownInstance), [ArgInstance()],

Also available in: Unified diff