Merge remote-tracking branch 'elasticsearch/master'

Author: UdiBen

Diff for: build/build.fsx

@@ -42,7 +42,7 @@ Target "BuildApp" (fun _ ->
     //from their interfaces
     //!! "build/output/Nest/Nest.xml" |> Seq.iter(fun f -> PatchXmlDoc f)
 
-    CopyFile "build/output/Elasticsearch.Net/init.ps1" "build/elasticsearch-init.ps1"
+    CopyFile "build/output/Elasticsearch.Net/install.ps1" "build/elasticsearch-init.ps1"
 
 )
 

Diff for: src/Nest/Domain/Analysis/TokenFilter/DelimitedPayloadTokenFilter.cs

@@ -0,0 +1,28 @@
+using Newtonsoft.Json;
+
+namespace Nest
+{
+    /// <summary>
+    /// A token filter of type delimited_token_filter. Splits tokens into tokens and payload whenever a delimiter character is found.
+    /// </summary>
+    public class DelimitedPayloadTokenFilter : TokenFilterBase
+    {
+
+        public DelimitedPayloadTokenFilter()
+            : base("delimited_payload_filter")
+        { }
+
+        /// <summary>
+        /// Character used for splitting the tokens. Default is '|'.
+        /// </summary>
+        [JsonProperty("delimiter")]
+        public char? Delimiter { get; set; }
+
+        /// <summary>
+        /// The type of the payload. 'int' for integer, 'float' for float and 'identity' for characters. Default is 'float.'
+        /// </summary>
+        [JsonProperty("encoding")]
+        public string Encoding { get; set; }
+
+    }
+}

Diff for: src/Nest/Nest.csproj

@@ -88,6 +88,7 @@
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Domain\Analysis\TokenFilter\DelimitedPayloadTokenFilter.cs" />
     <Compile Include="ConvenienceExtensions\AliasExtensions.cs" />
     <Compile Include="ConvenienceExtensions\CountExtensions.cs" />
     <Compile Include="ConvenienceExtensions\DeleteExtensions.cs" />
@@ -815,4 +816,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>