Merge branch '3.0' into 4.0

mgoldbeck · mgoldbeck · commit 25b916047e71 · 2018-05-22T21:17:00.000+02:00
diff --git a/Classes/Driver/Version5/SystemDriver.php b/Classes/Driver/Version5/SystemDriver.php
@@ -11,14 +11,14 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version1;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version2;
 use Neos\Flow\Annotations as Flow;
 
 /**
  * System driver for Elasticsearch version 5.x
  *
  * @Flow\Scope("singleton")
  */
-class SystemDriver extends Version1\SystemDriver
+class SystemDriver extends Version2\SystemDriver
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@`
`11`	`11`	`* source code.`
`12`	`12`	`*/`
`13`	`13`
`14`		`-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version1;`
	`14`	`+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version2;`
`15`	`15`	`use Neos\Flow\Annotations as Flow;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* System driver for Elasticsearch version 5.x`
`19`	`19`	`*`
`20`	`20`	`* @Flow\Scope("singleton")`
`21`	`21`	`*/`
`22`		`-class SystemDriver extends Version1\SystemDriver`
	`22`	`+class SystemDriver extends Version2\SystemDriver`
`23`	`23`	`{`
`24`	`24`	`}`