Cherry picked commits from @andyberryman PR 208

Reference: #208

Author: mythz

src/ServiceStack.Redis/Generic/RedisClientSortedSet.Generic.cs

@@ -187,9 +187,19 @@ public long PopulateWithIntersectOf(params IRedisSortedSet<T>[] setIds)
             return client.StoreIntersectFromSortedSets(this, setIds);
         }
 
+        public long PopulateWithIntersectOf(IRedisSortedSet<T>[] setIds, string[] args)
+        {
+            return client.StoreIntersectFromSortedSets(this, setIds, args);
+        }
+
         public long PopulateWithUnionOf(params IRedisSortedSet<T>[] setIds)
         {
             return client.StoreUnionFromSortedSets(this, setIds);
         }
+
+        public long PopulateWithUnionOf(IRedisSortedSet<T>[] setIds, string[] args)
+        {
+            return client.StoreUnionFromSortedSets(this, setIds, args);
+        }
     }
 }

src/ServiceStack.Redis/Generic/RedisTypedClient_SortedSet.cs

@@ -271,9 +271,19 @@ public long StoreIntersectFromSortedSets(IRedisSortedSet<T> intoSetId, params IR
             return client.StoreIntersectFromSortedSets(intoSetId.Id, setIds.Map(x => x.Id).ToArray());
         }
 
+        public long StoreIntersectFromSortedSets(IRedisSortedSet<T> intoSetId, IRedisSortedSet<T>[] setIds, string[] args)
+        {
+            return client.StoreIntersectFromSortedSets(intoSetId.Id, setIds.Map(x => x.Id).ToArray(), args);
+        }
+
         public long StoreUnionFromSortedSets(IRedisSortedSet<T> intoSetId, params IRedisSortedSet<T>[] setIds)
         {
             return client.StoreUnionFromSortedSets(intoSetId.Id, setIds.Map(x => x.Id).ToArray());
         }
+
+        public long StoreUnionFromSortedSets(IRedisSortedSet<T> intoSetId, IRedisSortedSet<T>[] setIds, string[] args)
+        {
+            return client.StoreUnionFromSortedSets(intoSetId.Id, setIds.Map(x => x.Id).ToArray(), args);
+        }
     }
 }

src/ServiceStack.Redis/RedisClient_SortedSet.cs

@@ -413,11 +413,21 @@ public long StoreIntersectFromSortedSets(string intoSetId, params string[] setId
 			return base.ZInterStore(intoSetId, setIds);
 		}
 
+        public long StoreIntersectFromSortedSets(string intoSetId, string[] setIds, string[] args)
+        {
+	        return base.ZInterStore(intoSetId, setIds, args);
+        }
+
 		public long StoreUnionFromSortedSets(string intoSetId, params string[] setIds)
 		{
 			return base.ZUnionStore(intoSetId, setIds);
 		}
 
+        public long StoreUnionFromSortedSets(string intoSetId, string[] setIds, string[] args)
+        {
+	        return base.ZUnionStore(intoSetId, setIds, args);
+        }
+
         private static string GetSearchStart(string start)
         {
             return start == null

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -1759,6 +1759,17 @@ public long ZUnionStore(string intoSetId, params string[] setIds)
             return SendExpectLong(cmdWithArgs);
         }
 
+        public long ZUnionStore(string intoSetId, string[] setIds, string[] args)
+        {
+            var totalArgs = new List<string>(setIds);
+            totalArgs.Insert(0, setIds.Length.ToString());
+            totalArgs.Insert(0, intoSetId);
+            totalArgs.AddRange(args);
+
+            var cmdWithArgs = MergeCommandWithArgs(Commands.ZUnionStore, totalArgs.ToArray());
+            return SendExpectLong(cmdWithArgs);
+        }
+
         public long ZInterStore(string intoSetId, params string[] setIds)
         {
             var setIdsList = new List<string>(setIds);
@@ -1769,6 +1780,17 @@ public long ZInterStore(string intoSetId, params string[] setIds)
             return SendExpectLong(cmdWithArgs);
         }
 
+        public long ZInterStore(string intoSetId, string[] setIds, string[] args)
+        {
+            var totalArgs = new List<string>(setIds);
+            totalArgs.Insert(0, setIds.Length.ToString());
+            totalArgs.Insert(0, intoSetId);
+            totalArgs.AddRange(args);
+
+            var cmdWithArgs = MergeCommandWithArgs(Commands.ZInterStore, totalArgs.ToArray());
+            return SendExpectLong(cmdWithArgs);
+        }
+
         public byte[][] ZRangeByLex(string setId, string min, string max, int? skip=null, int? take=null)
         {
             if (setId == null)

src/ServiceStack.Redis/RedisSentinelWorker.cs

@@ -66,7 +66,7 @@ private void SentinelMessageReceived(string channel, string message)
                 Log.Debug("Received '{0}' on channel '{1}' from Sentinel".Fmt(channel, message));
 
             // {+|-}sdown is the event for server coming up or down
-            if (channel.ToLower().Contains("sdown"))
+            if ((channel == "+failover-end") || channel.ToLower().Contains("sdown"))
             {
                 Log.Info("Sentinel detected server down/up with message:{0}".Fmt(message));