SrikanteswaraRao Talluri d22adf943d Merge branch 'marvin' ... Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org> Conflicts: test/integration/component/test_dynamic_compute_offering.py test/integration/smoke/test_deploy_vm.py test/integration/smoke/test_disk_offerings.py test/integration/smoke/test_volumes.py		2014-04-23 11:45:43 +05:30
..
apidoc	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00
appliance	build recent systemvm[64]templates	2014-02-27 17:48:18 +01:00
bugs-wiki	fixing license headers in marvin	2012-07-04 18:45:08 -04:00
build	create a (mini-)branch instead of creating a commit to revert	2013-12-23 14:35:29 +01:00
checkstyle	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00
cli	tools: Remove cloudmonkey, add info in INSTALL.md	2013-07-28 22:53:12 +05:30
devcloud	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00
devcloud-kvm	CLOUDSTACK-6181: Merge of resize root feature (resize-root branch)	2014-03-14 07:17:33 -06:00
eclipse	forgot about rat	2013-10-29 14:35:45 +01:00
git	Summary: Add default newline after summary in prepare-commit-msg	2013-02-06 10:23:17 -07:00
marvin	Merge branch 'marvin'	2014-04-23 11:45:43 +05:30
ngui	Externalized the hardcodedstrings from UI JAVASCRIPT files.	2014-03-05 14:11:51 -08:00
transifex	Update Transifex config file (add 4.4 resources config)	2014-04-01 19:44:07 +01:00
whisker	Adding httpclient ssl source files to legal documentation	2013-08-26 12:36:59 -04:00
pom.xml	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00