[NC-1968] Merge conflicts.

PegaSysEng · Feb 10, 2019 · ba87c6c · ba87c6c
1 parent 2b7bae0
commit ba87c6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...st/java/tech/pegasys/pantheon/ethereum/p2p/permissioning/NodeWhitelistControllerTest.java b/...st/java/tech/pegasys/pantheon/ethereum/p2p/permissioning/NodeWhitelistControllerTest.java
@@ -26,8 +26,8 @@
 import tech.pegasys.pantheon.ethereum.permissioning.PermissioningConfiguration;
 import tech.pegasys.pantheon.ethereum.permissioning.WhitelistFileSyncException;
 import tech.pegasys.pantheon.ethereum.permissioning.WhitelistOperationResult;
-import tech.pegasys.pantheon.util.bytes.BytesValue;
 import tech.pegasys.pantheon.ethereum.permissioning.WhitelistPersistor;
+import tech.pegasys.pantheon.util.bytes.BytesValue;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...ioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistor.java b/...ioning/src/main/java/tech/pegasys/pantheon/ethereum/permissioning/WhitelistPersistor.java
@@ -95,7 +95,7 @@ private static Map<WHITELIST_TYPE, Collection<String>> existingConfigItems(
                 o ->
                     o.getValue()
                         .toList()
-                        .stream()
+                        .parallelStream()
                         .map(Object::toString)
                         .collect(Collectors.toList())));
   }