Merge slaprunner-mmcleanup into master

Conflicts: slapos/runner/gittools.py

Merge slaprunner-mmcleanup into master
Conflicts: slapos/runner/gittools.py
b0ecfe66 · Cédric Le Ninivin · feb2ef01 · addad86a · b0ecfe66
Commit b0ecfe66 authored Sep 12, 2013 by Cédric Le Ninivin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

slapos/runner/gittools.py slapos/runner/gittools.py +1 -1

No files found.
--- a/slapos/runner/gittools.py
+++ b/slapos/runner/gittools.py
@@ -24,7 +24,7 @@ def cloneRepo(data):
  workDir = data['path']
  if not workDir:
    return jsonify(code=0,
-                   result="Cannot create project folder.")
+                   result="Can not create project folder.")
  code = 0
  json = ""
  try: