|
Todd Nicholson
|
29b80e32b5962bc52be4dba12f2200a8f1d8e810
|
merge, plus removing unused plugins from play.plugins |
|
|
Todd Nicholson
|
eaf03fe64722aca71d928a3a7101386154ee19d4
|
Merge branch '2.0-work-in-progress' into for-2.0-rabbitmq-service
# Conflicts:
# app/api/Datasets.scala
# app/api/Files.scala
# app/api/Indexes.scala
# app/api/Metadata.scala
# app/api/Status.scala
# app/controllers/Files.scala
# app/services/DI.scala
# app/services/mongodb/MongoDBFileService.scala
# app/services/mongodb/MongoDBMetadataService.scala
# doc/src/sphinx/admin/customizing.rst
# docker/play.plugins |
|
|
Todd Nicholson
|
7f2162c0e79bca798e65c898b48337a3cac89f48
m |
Transitioned Polyglot play plugin to guice service. |
|
|
Todd Nicholson
|
c41f0ab4fc227137232534b7092208245f1a5e66
m |
Replaced VersusPlugin with Guice Service. |
|
|
Max Burnette <mburnet2@illinois.com>
|
3f77fa6bfde63bc7671f5a8e774fb4975a9bd930
m |
Conversion of elasticsearch plugin to generic search service, including using queue traits and implementation. |
|