From 626a30164af580983883c2de79a49d92205c8e13 Mon Sep 17 00:00:00 2001
From: Spencer Alger <email@spalger.com>
Date: Wed, 10 Jun 2015 14:57:57 -0700
Subject: [PATCH] added ms as a possible interval unit

---
 src/lib/apis/master.js   | 2 +-
 src/lib/client_action.js | 2 +-
 src/lib/utils.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index ad36d7154..d571988fe 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -2563,7 +2563,7 @@ api.indices.prototype.flush = ca({
 });
 
 /**
- * Perform a [indices.flushSynced](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html) request
+ * Perform a [indices.flushSynced](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-synced-flush.html) request
  *
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {String, String[], Boolean} params.index - A comma-separated list of index names; use `_all` or empty string for all indices
diff --git a/src/lib/client_action.js b/src/lib/client_action.js
index 734934b57..271e48a89 100644
--- a/src/lib/client_action.js
+++ b/src/lib/client_action.js
@@ -125,7 +125,7 @@ var castType = {
     } else {
       throw new TypeError(
         'Invalid ' + name + ': expected a number or interval ' +
-        '(an integer followed by one of Mwdhmsy).'
+        '(an integer followed by one of M, w, d, h, m, s, y or ms).'
       );
     }
   },
diff --git a/src/lib/utils.js b/src/lib/utils.js
index a19ded8b1..fb4ea64d9 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -208,7 +208,7 @@ utils.isNumeric = function (val) {
 };
 
 // regexp to test for intervals
-var intervalRE = /^(\d+(?:\.\d+)?)([Mwdhmsy])$/;
+var intervalRE = /^(\d+(?:\.\d+)?)(M|w|d|h|m|s|y|ms)$/;
 
 /**
  * Test if a string represents an interval (eg. 1m, 2Y)