Merge pull request sclorg#1 from ekuiter/meteor-1.2

Meteor 1.2 support ,thanks @ekuiter

.openshift/action_hooks/build

@@ -26,7 +26,7 @@ fi
 #  Do npm install with the new npm binary.
 # check if a meteor repo is availabl
 if [ -f "${OPENSHIFT_REPO_DIR}"/programs/server/package.json ]; then
-echo "  - Installing Meteor 1.1 dependencies "
+echo "  - Installing Meteor 1.2 dependencies "
    echo
   (cd "${OPENSHIFT_REPO_DIR}/programs/server/npm/npm-bcrypt/node_modules"; rm -rf bcrypt) 
   (cd "${OPENSHIFT_REPO_DIR}/programs/server";export TMPDIR="tmp"; npm install bcrypt -d --cache ${OPENSHIFT_DATA_DIR})

.openshift/markers/NODEJS_VERSION

@@ -8,5 +8,5 @@
 #  0.10.25
 #  0.11.11
 #  0.12.2
-0.10.36
+0.10.40
 

README.md

@@ -1,9 +1,9 @@
-Run Meteor 1.1 on Red Hat's OpenShift PaaS
+Run Meteor 1.2 on Red Hat's OpenShift PaaS
 ====================================================================
 This git repository is a sample Meteor base cartidge with can be used with your 
 Meteor application to run it on openshift.com PaaS platform
 
-The catridge would install NodeJS version 0.10.36
+The catridge would install NodeJS version 0.10.40
 
 Step 0 
 ----------------------------------------------------------
@@ -12,7 +12,7 @@ Step 0
         https://developers.openshift.com/en/managing-client-tools.html
 
 
-Step 1 - Get NodeJS v0.10.36 running on your openshift app
+Step 1 - Get NodeJS v0.10.40 running on your openshift app
 ----------------------------------------------------------
 
 Create a new application `mynodeapp` in your openshift login control panel 
@@ -36,7 +36,7 @@ Then commit and push the repo to OpenShift
     git commit -a -m 'nodejs'
     git push
 
-You should now have a NodeJs version 0.10.36  application running at:
+You should now have a NodeJs version 0.10.40  application running at:
 
     http://mynodeapp-mydomain.rhcloud.com
     ( See env @ http://mynodeapp-mydomain.rhcloud.com/env )

meteorshim.js

@@ -21,10 +21,10 @@ fs.stat('main.js', function(err, stat) {
 if(!err)
 {
   // Start meteor server
-  console.log("************ Ready to START METEOR 1.1 SERVER  ************");
+  console.log("************ Ready to START METEOR 1.2 SERVER  ************");
   require('./main.js');
 }else{
-  console.log("************ Starting NodeJS 0.10.36 SERVER  ************");
+  console.log("************ Starting NodeJS 0.10.40 SERVER  ************");
   require('./server.js');
 }
 });