Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
This commit is contained in:
Shay Banon 2012-01-31 14:37:53 +02:00
commit 01340a408d
1 changed files with 7 additions and 7 deletions

View File

@ -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`. In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-mapper-attachments/1.0.0`.
--------------------------------------- -----------------------------------------------
| memcached Plugin | ElasticSearch | | Attachment Mapper Plugin | ElasticSearch |
--------------------------------------- -----------------------------------------------
| master | master (0.19) | | master | 0.18 -> master |
--------------------------------------- -----------------------------------------------
| 1.0.0 | 0.18 -> master | | 1.0.0 | 0.18 -> master |
--------------------------------------- -----------------------------------------------