Ruben S. Montero 3874271a69 Merge branch 'master' into feature-863 ... Conflicts: install.sh src/cli/one_helper/onevnet_helper.rb src/mad/ruby/ActionManager.rb		2011-12-02 18:13:39 +01:00
..
doc	Bug #668: Change the LCM, the cancel action executes the epilog on success	2011-09-12 18:15:36 +02:00
etc	Merge branch 'master' into feature-863	2011-12-02 18:13:39 +01:00
examples	Add missing oZones templates	2011-07-15 18:07:30 +02:00
hooks	bug: Update hook information in oned.conf. Moved ft hooks to a dir. Removed unneeded hooks.	2011-09-01 16:57:02 +02:00
install_gems	typo in install_gems (nokogiri)	2011-10-14 17:30:24 +02:00
man	Added man pages for econe/occi CLI 3.0.0	2011-09-28 19:36:57 +02:00
scons	Fix scons tests for xml-rpc-c with gcc 4.6	2011-04-22 00:39:17 +02:00
scripts	Bug #648: vmcontext.sh script is not LSB compliant	2011-08-31 18:33:18 +02:00
test	Feature #662, #407: Delete operator<< from PoolObjectSQL classes. Remove Cluster objects.	2011-06-03 15:33:48 +02:00
install_novnc.sh	bug #831: Adapt novnc installer to the new yaml configuration format	2011-09-26 15:13:45 +02:00