Merge branch 'master' into feat/crop-uploaded-image

CHANGES.md

@@ -1,9 +1,14 @@
 # CHANGES
 
-## 3.5.16-RC
+## 3.5.17-RC
 
 * 
 
+## 3.5.16
+
+* Fix: Full Text Search doesn't work after when building indices
+    * Introduced by 3.5.12
+
 ## 3.5.15
 
 * Feature: Import/Export Page data

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "3.5.16-RC",
+  "version": "3.5.17-RC",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",

src/server/util/search.js

@@ -264,7 +264,7 @@ SearchClient.prototype.prepareBodyForCreate = function(body, page) {
 
   const command = {
     index: {
-      _index: this.aliasName,
+      _index: this.indexName,
       _type: 'pages',
       _id: page._id.toString(),
     },