Ruben S. Montero 727826b0a8 Merge branch 'feature-1223' ...

Conflicts:
	src/image/ImageManagerActions.cc
	src/oca/java/src/org/opennebula/client/vm/VirtualMachine.java

2012-06-19 23:48:13 +02:00

..

test

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

SConstruct

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

template_parser.c

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

template_parser.l

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

template_syntax.cc

Bug #1033: Generate template parser files from 60f6321eb4

2011-12-19 22:19:50 +01:00

template_syntax.h

Feature: Enable use of user metadata in context

2011-11-10 23:35:12 +01:00

template_syntax.y

Bump to version 3.2.0

2012-01-12 12:29:18 +01:00

Template.cc

Merge branch 'feature-1223'

2012-06-19 23:48:13 +02:00