Murali Reddy 0f9f428ad1 Merge branch 'master' into events-framework ... Conflicts: api/src/com/cloud/event/EventTypes.java server/src/com/cloud/network/firewall/FirewallManagerImpl.java tools/whisker/LICENSE tools/whisker/descriptor-for-packaging.xml		2013-01-31 19:52:27 +05:30
..
apidoc	Revert "apidoc: Remove api discovery from toc"	2013-01-14 20:55:13 -08:00
bugs-wiki	fixing license headers in marvin	2012-07-04 18:45:08 -04:00
build	docs: Build the installation guide instead of "all"	2012-10-22 12:08:11 +02:00
cli	cli: Pygments based output in cloudmonkey and new cfg processing	2013-01-28 17:59:37 -08:00
devcloud	maven: create dependency, deploydb on developer first and then on devcloud	2013-01-22 16:30:35 -08:00
devcloud-kvm	maven: create dependency, deploydb on developer first and then on devcloud	2013-01-22 16:30:35 -08:00
git	Summary: Add Bugfix-for line to prepare-commit-msg	2012-11-07 10:07:07 -07:00
marvin	propagate storagetype fix from commit e49b3b to diskOffering	2013-01-31 16:03:43 +05:30
waf	Patch from Gavin Lee: Change license to ASL2.0 in server and tools	2012-08-30 10:36:29 -04:00
whisker	Merge branch 'master' into events-framework	2013-01-31 19:52:27 +05:30