cloudstack/server/src/com/cloud
will f8c93cd5fa Bug #:5975
Merge from 2.1.x

- Fixed issue where listAccounts only return one less than the actual number of accounts in the system.  That is because the SQL query asks for X accounts, but the API filters out the SYSTEM account.  The fix is to add the filter of the system account in the actual query itself rather than have the code do it.

Conflicts:

	server/src/com/cloud/api/commands/ListAccountsCmd.java
2010-08-25 18:21:32 -07:00
..
agent/manager Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 15:10:15 -07:00
alert bug 5781: also reduce the scope of the global lock when updating storage capacity. 2010-08-23 13:41:22 -07:00
api Bug #:5975 2010-08-25 18:21:32 -07:00
async add zone id for create template event 2010-08-23 17:19:31 +05:30
cluster Source code committed 2010-08-11 09:13:29 -07:00
configuration my changes 2010-08-23 13:59:23 -07:00
consoleproxy bug 5764: checkin before I switch to work on 2.1.x 2010-08-24 14:40:29 -07:00
ha Source code committed 2010-08-11 09:13:29 -07:00
hypervisor bug 5764: checkin before I switch to work on 2.1.x 2010-08-24 14:40:29 -07:00
maid Source code committed 2010-08-11 09:13:29 -07:00
maint Source code committed 2010-08-11 09:13:29 -07:00
migration my changes 2010-08-23 13:59:23 -07:00
network check in for Alex. 2010-08-24 15:48:40 -07:00
offerings/dao bug 5764: changing from networkoffering to network profile 2010-08-24 00:00:43 -07:00
resource "Add host" for kvm: 2010-08-13 23:19:36 -07:00
server Bug #:5975 2010-08-25 18:21:32 -07:00
servlet add templates.vmware.sql 2010-08-24 22:58:05 -07:00
storage Issue #: 5978 5977 5971 5972 2010-08-25 15:27:34 -07:00
template Source code committed 2010-08-11 09:13:29 -07:00
test my changes 2010-08-23 13:59:23 -07:00
user my changes 2010-08-23 13:59:23 -07:00
vm Issue #: 5978 5977 5971 5972 2010-08-25 15:27:34 -07:00