Alena Prokharchyk 0cfe96bd00 Merge branch 'master' into internallb1 ... Conflicts: api/src/com/cloud/network/IpAddress.java server/src/com/cloud/network/NetworkServiceImpl.java setup/db/db/schema-410to420.sql		2013-04-17 15:51:05 -07:00
..
agent	CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory	2013-03-05 19:03:30 -05:00
alert	Add missing Apache license header.	2013-03-08 14:38:35 -08:00
api	CLOUDSTACK-1253: Remove @author tag.	2013-02-15 10:42:06 -08:00
async	Removing ^M's from code.	2013-04-04 00:53:20 +05:30
capacity	Correcting the license header problem that was introduced with commit	2013-02-22 11:06:47 -05:00
configuration	Create Public IP address - If system account is specified do nothing	2013-04-17 02:16:07 +05:30
event	Add missing Apache license header.	2013-03-08 14:38:35 -08:00
keystore	commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44	2012-12-17 17:44:39 -08:00
network	Merge branch 'master' into internallb1	2013-04-17 15:51:05 -07:00
projects	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
resource	CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more	2013-02-26 23:16:17 -08:00
resourcelimit	CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts	2013-03-29 11:26:38 +05:30
snapshot	Removing ^M's from code.	2013-04-04 00:53:20 +05:30
storage/dao	Removing ^M's from code.	2013-04-04 00:53:20 +05:30
upgrade	ignore the tests looking for db	2013-03-01 12:04:06 +05:30
user	CLOUDSTACK-1636: Removed the concept of owner region.	2013-03-14 11:53:40 +05:30
vm	Changes to add AffinityGroupprocessor, deployVM changes	2013-04-11 13:22:42 -07:00
vpc	Merge branch 'master' into internallb1	2013-04-17 15:51:05 -07:00