Merge branch '1.9.x' into dev

This commit is contained in:
Lombiq
2015-11-19 13:59:15 +01:00
2 changed files with 4 additions and 2 deletions

2
.hgeol Normal file
View File

@@ -0,0 +1,2 @@
[patterns]
** = native

View File

@@ -12,7 +12,7 @@ namespace Orchard.OutputCache.Models {
public virtual int GraceTime { get; set; }
public virtual DateTime ValidUntilUtc { get; set; }
public virtual DateTime StoredUntilUtc { get; set; }
public virtual byte[] Output { get; set; }
[StringLengthMax] public virtual byte[] Output { get; set; }
public virtual string ContentType { get; set; }
[StringLength(2048)] public virtual string QueryString { get; set; }
[StringLength(2048)] public virtual string CacheKey { get; set; }
@@ -22,4 +22,4 @@ namespace Orchard.OutputCache.Models {
public virtual int StatusCode { get; set; }
[StringLengthMax] public virtual string Tags { get; set; }
}
}
}