Merge "Issue #1467 - updated the memory settings for 64-bit GFE" into development

Former-commit-id: a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly a9410160a8 [formerly d02e1ff0a7] [formerly a3e10f6dcd] [formerly 62f89e6189 [formerly a3e10f6dcd [formerly 5f262d2cb46ad8ff0ec355e64ee73b6deb7ed454]]]]
Former-commit-id: 62f89e6189
Former-commit-id: cce4bebbe5 [formerly ef3468acd4] [formerly d12f5df726ebd0677bc478849410246bfac0e228 [formerly 5733a44770]]
Former-commit-id: fc2bdf799b307430f81e2eb541330216b1e02446 [formerly 4d91741212]
Former-commit-id: 3fff3b0d0b
This commit is contained in:
Nate Jensen 2013-01-10 10:31:05 -06:00 committed by Gerrit Code Review
commit 1f724217ca

View file

@ -127,7 +127,7 @@
</max-memory>
<max-perm>
<value>DEFAULT</value>
<value>256m</value>
</max-perm>
</ini-substitutions>
</memory-setting>