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

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

View File

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

View File

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