Commit 8867718

committed

Merge branch 'master' of

https://github.com/avolz/spring-data-elasticsearch.git Conflicts: src/main/java/org/springframework/data/elasticsearch/annotations/FieldIndex.java src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java

2 parents 2367d89 + 1b867cf commit 8867718Copy full SHA for 8867718

1 file changed

+301

-315

lines changed

src/main/java/org/springframework/data/elasticsearch/core
- MappingBuilder.java

1 file changed

+301

-315

lines changed

Comments

(0)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8867718

1 file changed

1 file changed

File tree

1 file changed

1 file changed

0 commit comments