[incubator-openwhisk] branch master updated: Fix compile error because of subsequent merges. (#2679)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new e2bba5d  Fix compile error because of subsequent merges. (#2679)
e2bba5d is described below

commit e2bba5d2d4e1ff814186eb3a44fb4416aab2a2fd
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Thu Aug 31 16:38:06 2017 +0200

    Fix compile error because of subsequent merges. (#2679)
---
 .../src/main/scala/whisk/core/database/RemoteCacheInvalidation.scala    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scala/src/main/scala/whisk/core/database/RemoteCacheInvalidation.scala b/common/scala/src/main/scala/whisk/core/database/RemoteCacheInvalidation.scala
index 902bf7d..621feb6 100644
--- a/common/scala/src/main/scala/whisk/core/database/RemoteCacheInvalidation.scala
+++ b/common/scala/src/main/scala/whisk/core/database/RemoteCacheInvalidation.scala
@@ -57,7 +57,7 @@ class RemoteCacheInvalidation(config: WhiskConfig, component: String, instance:
     private val topic = "cacheInvalidation"
     private val instanceId = s"$component${instance.toInt}"
 
-    private val msgProvider = SpiLoader.get[MessagingProvider]()
+    private val msgProvider = SpiLoader.get[MessagingProvider]
     private val cacheInvalidationConsumer = msgProvider.getConsumer(config, s"$topic$instanceId", topic, maxPeek = 128)
     private val cacheInvalidationProducer = msgProvider.getProducer(config, ec)
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].