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

1
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
View file

@ -20,6 +20,7 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
using System.Diagnostics; using System.Diagnostics;
using System.Data; using System.Data;
using WebsitePanel.Providers.HostedSolution; using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Providers.Common;
using WebsitePanel.EnterpriseServer.Base.HostedSolution; using WebsitePanel.EnterpriseServer.Base.HostedSolution;
using WebsitePanel.Providers.ResultObjects; using WebsitePanel.Providers.ResultObjects;
using WebsitePanel.Providers; using WebsitePanel.Providers;

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

@ -376,13 +376,6 @@ namespace WebsitePanel.Providers.HostedSolution
set { createdResourceMailboxes = value; } 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 public int AllocatedDeletedUsers
{ {
get { return allocatedDeletedUsers; } get { return allocatedDeletedUsers; }
@ -405,6 +398,13 @@ namespace WebsitePanel.Providers.HostedSolution
get { return usedDeletedUsersBackupStorageSpace; } get { return usedDeletedUsersBackupStorageSpace; }
set { usedDeletedUsersBackupStorageSpace = value; } 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; }
} }
} }