Simon Willnauer 7e5f9d5628 Merge branch 'master' into pr-10624
Conflicts:
	src/main/java/org/elasticsearch/index/engine/EngineConfig.java
	src/main/java/org/elasticsearch/index/shard/IndexShard.java
	src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
	src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java
2015-05-04 11:37:54 +02:00
..
2015-04-04 16:50:04 +02:00
2015-04-14 19:11:09 +02:00
2015-04-10 17:38:36 +02:00
2015-04-27 17:19:36 +02:00
2014-09-11 09:52:09 +02:00
2015-04-27 13:45:35 +02:00
2015-04-23 08:52:34 +02:00