7 Commits

Author	SHA1	Message	Date
Rohit Yadav	fcb4b7a6a7	CLOUDSTACK-1237: Fix an overriding method that would help find template adapter ... Signed-off-by: Rohit Yadav <bhaisaab@apache.org>	2013-02-13 15:19:30 +05:30
Kelven Yang	7bd8bec68a	Sync javelin with master up to 894cb8f7d9	2013-01-31 17:20:19 -08:00
Sheng Yang	5cb9df91a1	Merge branch 'ipv6' ... Conflicts: api/src/com/cloud/network/NetworkProfile.java	2013-01-31 15:07:33 -08:00
Kelven Yang	1b2b369ecb	Merge latest master into javelin	2013-01-31 11:34:49 -08:00
Rohit Yadav	d7ad2da7e0	server: Fix network refactor regressions for CLOUDSTACK-297 ... Signed-off-by: Rohit Yadav <bhaisaab@apache.org>	2013-01-30 17:33:53 -08:00
David Nalley	1b39b0e908	fixing licensing headers	2013-01-29 23:45:11 -05:00
frank	1f7eaf3d61	CloudStack CLOUDSTACK-774 ... Supporting kickstart in CloudStack baremetal merge baremetal feature to master	2013-01-29 17:19:57 -08:00