Merge branch 'master' into native-type-to-strings

Author: tylerjl

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 #### Fixes
 * REST-based resources are now coerced to string values to uniformly compare user defined values and Elasticsearch API responses.
+* Resolve deprecation warnings related to use of the deprecated is_array() function.
 
 ## 6.3.0 (June 18, 2018)
 

manifests/instance.pp

@@ -203,7 +203,7 @@
     # String or array for data dir(s)
     if ($datadir == undef) {
       if ($datadir_instance_directories) {
-        if (is_array($elasticsearch::datadir)) {
+        if $elasticsearch::datadir =~ Array {
           $instance_datadir = array_suffix($elasticsearch::datadir, "/${name}")
         } else {
           $instance_datadir = "${elasticsearch::datadir}/${name}"
@@ -257,7 +257,7 @@
 
     $instance_datadir_config = { 'path.data' => $instance_datadir }
 
-    if(is_array($instance_datadir)) {
+    if $instance_datadir =~ Array {
       $dirs = join($instance_datadir, ' ')
     } else {
       $dirs = $instance_datadir