Merge remote-tracking branch 'origin/master'
Conflicts: README.md
This commit is contained in:
commit
01340a408d
14
README.md
14
README.md
|
@ -5,11 +5,11 @@ The mapper attachments plugin adds the `attachment` type to ElasticSearch using
|
|||
|
||||
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-mapper-attachments/1.0.0`.
|
||||
|
||||
---------------------------------------
|
||||
| memcached Plugin | ElasticSearch |
|
||||
---------------------------------------
|
||||
| master | master (0.19) |
|
||||
---------------------------------------
|
||||
| 1.0.0 | 0.18 -> master |
|
||||
---------------------------------------
|
||||
-----------------------------------------------
|
||||
| Attachment Mapper Plugin | ElasticSearch |
|
||||
-----------------------------------------------
|
||||
| master | 0.18 -> master |
|
||||
-----------------------------------------------
|
||||
| 1.0.0 | 0.18 -> master |
|
||||
-----------------------------------------------
|
||||
|
||||
|
|
Loading…
Reference in New Issue