Merge remote-tracking branch 'origin/release' into feanil/merge_release

Conflicts:
	cloudformation_templates/edx-reference-architecture.json

cloudformation_templates/edx-reference-architecture.json

@@ -2952,7 +2952,7 @@
             },
             "Path": "/", 
             "Policies": [ {
-              "PolicyName": "ForumBasePolicy",
+              "PolicyName": "XqueueBasePolicy",
               "PolicyDocument": {
                 "Statement":[
                   {
@@ -2995,7 +2995,7 @@
             },
             "Path": "/",
             "Policies": [ {
-              "PolicyName": "EdxAppBasePolicy",
+              "PolicyName": "XServerBasePolicy",
               "PolicyDocument": {
                 "Statement":[
                   {
@@ -3038,7 +3038,7 @@
             },
             "Path": "/",
             "Policies": [ {
-              "PolicyName": "EdxAppBasePolicy",
+              "PolicyName": "ForumBasePolicy",
               "PolicyDocument": {
                 "Statement":[
                   {

util/jenkins/ansible-provision.sh

@@ -65,9 +65,9 @@ fi
 
 if [[ -z $ami ]]; then
   if [[ $server_type == "full_edx_installation" ]]; then
-    ami="ami-bd6b6ed4"
+    ami="ami-ad1a0dc4"
   elif [[ $server_type == "ubuntu_12.04" || $server_type == "full_edx_installation_from_scratch" ]]; then
-    ami="ami-a73264ce"
+    ami="ami-59a4a230"
   fi
 fi
 

vagrant/release/devstack/Vagrantfile

@@ -36,8 +36,8 @@ end
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX devstack VM from an official release
-  config.vm.box     = "gugelhupf-devstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140210-gugelhupf-devstack.box"
+  config.vm.box     = "himbasha-devstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140325-himbasha-devstack.box"
 
   config.vm.network :private_network, ip: "192.168.33.10"
   config.vm.network :forwarded_port, guest: 8000, host: 8000

vagrant/release/fullstack/Vagrantfile

@@ -6,8 +6,8 @@ CPU_COUNT = 2
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX fullstack VM from an official release
-  config.vm.box     = "gugelhupf"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140210-gugelhupf-fullstack.box"
+  config.vm.box     = "himbasha-fullstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140325-himbasha-fullstack.box"
 
   config.vm.network :private_network, ip: "192.168.33.10"
   config.hostsupdater.aliases = ["preview.localhost"]