Commit 4eafeca0 by John Jarvis

Merge branch 'master' into jarv/mirror

parents 72aa3ec7 01590d59
...@@ -9,3 +9,11 @@ Will Daly <will@edx.org> ...@@ -9,3 +9,11 @@ Will Daly <will@edx.org>
Bethany LaPenta <lapentab@mit.edu> Bethany LaPenta <lapentab@mit.edu>
Jay Zoldak <jzoldak@edx.org> Jay Zoldak <jzoldak@edx.org>
Philippe Chiu <philippe.chiu@gmail.com> Philippe Chiu <philippe.chiu@gmail.com>
Marko Seric <marko.seric@math.uzh.ch>
Feanil Patel <feanil@edx.org>
Calen Pennington <calen.pennington@gmail.com>
David Baumgold <david@davidbaumgold.com>
Kevin Luo <kevluo@edx.org>
Carson Gee <x@carsongee.com>
Xavier Antoviaque <xavier@antoviaque.org>
James Tauber <jtauber@jtauber.com>
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
**This project is currently in alpha** **This project is currently in alpha**
The goal of the edx/configuration project is to provide a simple, but The goal of the edx/configuration project is to provide a simple, but
flexible, way for anyone to stand up an instance of the edX platform flexible, way for anyone to stand up an instance of Open edX that is
that is fully configured and ready-to-go. fully configured and ready-to-go.
Building the platform takes place to two phases: Building the platform takes place to two phases:
......
MEMORY = 1536 MEMORY = 2048
CPU_COUNT = 2 CPU_COUNT = 2
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
......
MEMORY = 1024 MEMORY = 2048
CPU_COUNT = 2 CPU_COUNT = 2
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment