Merge branch '2.3' into 3.0

neo4j · Mar 2, 2016 · 9008afb · 9008afb
2 parents a91d772 + 55834d0
commit 9008afb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/...ity/kernel/src/main/resources/META-INF/services/org.neo4j.kernel.impl.cache.CacheProvider b/...ity/kernel/src/main/resources/META-INF/services/org.neo4j.kernel.impl.cache.CacheProvider
diff --git a/...ise/management/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin b/...ise/management/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin