Revision 2e06f4f2
| ID | 2e06f4f26df4d0831e2856f9d84f561c8a02695e |
| Parent | 67d8862c, 9311f27b |
| Child | 6c322afd |
Merge branch 'feature-189'
Conflicts:
include/VirtualMachine.h
include/VirtualMachinePool.h
include/VirtualNetwork.h
share/etc/oned.conf
src/scheduler/src/xml/expr_arith.cc
src/scheduler/src/xml/expr_arith.h
src/scheduler/src/xml/expr_bool.cc
src/scheduler/src/xml/expr_bool.h
src/scheduler/src/xml/expr_parser.c
src/template/template_parser.c
src/template/template_syntax.cc
src/template/template_syntax.h
src/vm/VirtualMachine.cc
src/vm/VirtualMachinePool.cc
src/vm/vm_var_parser.c
src/vm/vm_var_syntax.cc
src/vm/vm_var_syntax.h
Files
- added
- modified
- copied
- renamed
- deleted