Merge remote-tracking branch 'upstream/master'

storj-archived · Jun 19, 2017 · 1da8b57 · 1da8b57
2 parents 5ce03c2 + faa322c
commit 1da8b57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/script/farmer.js b/script/farmer.js
@@ -20,6 +20,7 @@ let farmerState = {
 
 config.keyPair = new storj.KeyPair(config.networkPrivateKey);
 config.logger = new Logger(config.loggerVerbosity);
+config.maxShardSize = config.maxShardSize ? bytes.parse(config.maxShardSize) : null;
 config.storageManager = new storj.StorageManager(
   new storj.EmbeddedStorageAdapter(config.storagePath),
   {

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -11,7 +11,7 @@ confinement: strict
 apps:
   storjshare:
     command: storjshare
-    plugs: [network, network-bind]
+    plugs: [network, network-bind, home]
 
 parts:
   storjshare-daemon: