zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge problems fixing

Browse source
This commit is contained in:
vfedosevich 2015-01-21 02:47:40 -08:00
commit 3dcf48966a
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs
View file

@ -376,19 +376,12 @@ namespace WebsitePanel.Providers.HostedSolution
set { createdResourceMailboxes = value; }
}
public int CreatedRdsServers { get; set; }
public int CreatedRdsCollections { get; set; }
public int CreatedRdsUsers { get; set; }
public int AllocatedRdsServers { get; set; }
public int AllocatedRdsCollections { get; set; }
public int AllocatedRdsUsers { get; set; }
public int AllocatedDeletedUsers
{
get { return allocatedDeletedUsers; }
set { allocatedDeletedUsers = value; }
}
public int DeletedUsers
{
get { return deletedUsers; }
@ -405,6 +398,13 @@ namespace WebsitePanel.Providers.HostedSolution
get { return usedDeletedUsersBackupStorageSpace; }
set { usedDeletedUsersBackupStorageSpace = value; }
}
public int CreatedRdsServers { get; set; }
public int CreatedRdsCollections { get; set; }
public int CreatedRdsUsers { get; set; }
public int AllocatedRdsServers { get; set; }
public int AllocatedRdsCollections { get; set; }
public int AllocatedRdsUsers { get; set; }
}
}