Merge branch 'master' of github.com:mpdehaan/ansible

This commit is contained in:
Michael DeHaan 2012-02-23 22:50:45 -05:00
commit 4a891b4108
2 changed files with 8 additions and 2 deletions

View file

@ -1,6 +1,9 @@
#!/usr/bin/python #!/usr/bin/python
import json try:
import json
except ImportError:
import simplejson as json
import subprocess import subprocess
import sys import sys
import datetime import datetime

View file

@ -1,5 +1,8 @@
#!/usr/bin/python #!/usr/bin/python
import json try:
import json
except ImportError:
import simplejson as json
print json.dumps(1) print json.dumps(1)