Permalink
Browse files

merge

  • Loading branch information...
2 parents 53d8464 + 99f6db1 commit 3e30f727ed3e2ecf767828b9b4527c2cc611c546 @Swaagie Swaagie committed Apr 1, 2013
Showing with 8 additions and 0 deletions.
  1. +6 −0 content/a-quickstart/faq.md
  2. +2 −0 content/features/business.md
@@ -256,6 +256,7 @@ and only if everything went ok, so a failed deploy does not equate to down time.
---
+<<<<<<< HEAD
## Why is the subdirectory or its content not deployed to Nodejitsu?
Execute `npm pack` inside your application and make sure that the resulting
@@ -298,5 +299,10 @@ var app = require('express')()
server.listen(8080);
```
+## Can I write to the file system? What are the limits?
+
+File system on our virtual machines is both readable and writable, but does not
+persist across deploys. Capacity of the file system is 3 GB.
+
[docs]: http://socket.io/#how-to-use
[meta:title]: <> (FAQ)
@@ -130,6 +130,8 @@ You can scale your application by adding more drones or ram, using the
### To Add more ram
To setup the RAM of the drone use the `--ram <size>` parameter.
+Larger drone are metered as multiple 256MB drones.
+For example, two 512MB drones would be metered as four drones.
Example:

0 comments on commit 3e30f72

Please sign in to comment.