Merge branch 'master' of github.com:Mpdreamz/NEST into feature/aggregations

Author: Mpdreamz

src/Nest/DSL/Suggest/CompletionSuggestDescriptor.cs

@@ -14,6 +14,12 @@ public class CompletionSuggestDescriptor<T> : BaseSuggestDescriptor<T> where T :
 		[JsonProperty(PropertyName = "fuzzy")]
 		internal FuzzySuggestDescriptor<T> _Fuzzy { get; set; }
 
+		public CompletionSuggestDescriptor<T> Size(int size)
+		{
+			this._Size = size;
+			return this;
+		} 
+
 		public CompletionSuggestDescriptor<T> Text(string text)
 		{
 			this._Text = text;

src/Nest/Enums/FieldType.cs

@@ -62,6 +62,10 @@ public enum FieldType
 		/// Completion type.
 		/// </summary>
 		completion,
+    /// <summary>
+    /// Nested type.
+    /// </summary>
+    nested,
 		/// <summary>
 		/// object type, no need to set this manually if its not a value type this will be set.
 		/// Only set this if you need to force a value type to be mapped to an elasticsearch object type.

src/Nest/Resolvers/Writers/TypeMappingWriter.cs

@@ -149,7 +149,7 @@ internal void WriteProperties(JsonWriter jsonWriter)
 					}
 					if (att != null)
 						this.WritePropertiesFromAttribute(jsonWriter, att, propertyName, type);
-					if (type == "object")
+					if (type == "object" || type == "nested")
 					{
 
 						var deepType = p.PropertyType;
@@ -228,9 +228,10 @@ private string GetElasticSearchTypeFromFieldType(FieldType? fieldType)
 					return "date";
 				case FieldType.boolean_type:
 					return "boolean";
-				
 				case FieldType.completion:
 					return "completion";
+        case FieldType.nested:
+          return "nested";
 				case FieldType.@object:
 					return "object";
 				default: