diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /sandbox/json/sh/test.json | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'sandbox/json/sh/test.json')
| -rw-r--r-- | sandbox/json/sh/test.json | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sandbox/json/sh/test.json b/sandbox/json/sh/test.json new file mode 100644 index 00000000..9b4c6312 --- /dev/null +++ b/sandbox/json/sh/test.json @@ -0,0 +1,7 @@ +{ + "a": "1", + "b": 2, + "c": { "ca": 11, "cb": [1, 2, 3, "42"] }, + "d": {}, + "float": 4.23 +} |