Permalink
Browse files

merge conflict resolved

Merge branch 'magellan' of github.com:nimbusproject/nimbus into magellan

Conflicts:
	tests/cc-unprop-md5test.py
  • Loading branch information...
2 parents 98cb748 + f57bf2a commit 627559913d4513e3a18426938bb71600182a6595 BuzzTroll committed Oct 28, 2010
Showing with 3 additions and 0 deletions.
  1. +3 −0 tests/cc-unprop-md5test.py
@@ -53,6 +53,7 @@
if rc != 0:
print "s3 info failed"
sys.exit(1)
+<<<<<<< HEAD
# down load the new name with s3cmd
cmd="s3cmd get s3://Repo/VMS/%s/%s %s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name, localfile)
print cmd
@@ -67,6 +68,8 @@
if not rc:
print "files differ"
sys.exit(1)
+=======
+>>>>>>> f57bf2a56314b132ba2545f73f152d02e3530038
cmd="s3cmd info s3://Repo/VMS/%s/%s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name)
print cmd

0 comments on commit 6275599

Please sign in to comment.