Merge branch 'missing_comma' into 1.0.x

This commit is contained in:
Hunter Haugen 2014-02-25 13:36:12 -08:00
commit 5e841a91f7

Fájl megtekintése

@ -12,55 +12,55 @@
"operatingsystemrelease": [ "operatingsystemrelease": [
"5", "5",
"6" "6"
], ]
}, },
{ {
"operatingsystem": "CentOS", "operatingsystem": "CentOS",
"operatingsystemrelease": [ "operatingsystemrelease": [
"5", "5",
"6" "6"
], ]
}, },
{ {
"operatingsystem": "OracleLinux", "operatingsystem": "OracleLinux",
"operatingsystemrelease": [ "operatingsystemrelease": [
"5", "5",
"6" "6"
], ]
}, },
{ {
"operatingsystem": "Scientific", "operatingsystem": "Scientific",
"operatingsystemrelease": [ "operatingsystemrelease": [
"5", "5",
"6" "6"
], ]
}, },
{ {
"operatingsystem": "SLES", "operatingsystem": "SLES",
"operatingsystemrelease": [ "operatingsystemrelease": [
"11 SP1" "11 SP1"
], ]
}, },
{ {
"operatingsystem": "Debian", "operatingsystem": "Debian",
"operatingsystemrelease": [ "operatingsystemrelease": [
"6", "6",
"7" "7"
], ]
}, },
{ {
"operatingsystem": "Ubuntu", "operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "operatingsystemrelease": [
"10.04", "10.04",
"12.04", "12.04"
], ]
}, },
{ {
"operatingsystem": "Solaris", "operatingsystem": "Solaris",
"operatingsystemrelease": [ "operatingsystemrelease": [
"10" "10"
], ]
} },
{ {
"operatingsystem": "Windows", "operatingsystem": "Windows",
"operatingsystemrelease": [ "operatingsystemrelease": [
@ -69,12 +69,12 @@
"Server 2012", "Server 2012",
"Server 2012 R2", "Server 2012 R2",
"7" "7"
], ]
} }
], ],
"requirements": [ "requirements": [
{ "name": "pe", "version_requirement": "3.2.x" }, { "name": "pe", "version_requirement": "3.2.x" },
{ "name": "puppet", "version_requirement": "3.x" }, { "name": "puppet", "version_requirement": "3.x" }
], ],
"dependencies": [] "dependencies": []
} }