github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-22 23:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from twitter-forks/merge-fix

Browse Source 
fix from manual merge
This commit is contained in:
Ryan O'Neill 2015-08-06 14:34:02 -07:00
commit 0755daa9db
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/src/test/resources/beanconfig/beanconfig01.conf
View File

@ -52,7 +52,17 @@
"ofConfigObject" : [${numbers}, ${booleans}, ${strings}], "ofConfigObject" : [${numbers}, ${booleans}, ${strings}],
"ofConfigValue" : [1, 2, "a"], "ofConfigValue" : [1, 2, "a"],
"ofDuration" : [1, 2h, 3 days], "ofDuration" : [1, 2h, 3 days],
"ofMemorySize" : [1024, 1M, 1G] "ofMemorySize" : [1024, 1M, 1G],
"ofStringBean" : [
{
abcd : "testAbcdOne"
yes : "testYesOne"
},
{
abcd : "testAbcdTwo"
yes : "testYesTwo"
}
]
}, },
"bytes" : { "bytes" : {
"kilobyte" : "1kB", "kilobyte" : "1kB",
@ -83,4 +93,4 @@
"list" : [1,2,3], "list" : [1,2,3],
"unwrappedMap" : ${validation} "unwrappedMap" : ${validation}
} }
} }