github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-01-15 23:01:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
689 Commits 9 Branches 33 Tags 6.2 MiB
f115731071
Commit Graph

689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Havoc Pennington
2edf846752 Add Gitter chat room 2015-02-09 09:14:27 -05:00
Havoc Pennington
10bb00cbf9 Merge pull request #248 from tkawachi/duration-message 
Suggest h when failed to parse duration
 2015-02-03 00:18:27 -05:00
KAWACHI Takashi
83ceb90a89 Suggest h when failed to parse duration 2015-02-03 13:50:34 +09:00
Havoc Pennington
ce394080a1 Merge pull request #243 from acaly/set_origin 
Add methods to create and set origin.
 2015-01-27 08:58:48 -05:00
Havoc Pennington
e87093f0bf Merge pull request #242 from zhongl/master 
Insert a new config scala wrapper to readme
 2015-01-27 08:56:56 -05:00
Havoc Pennington
337206041f Merge pull request #245 from dwijnand/docker-travisci 
Switch to Travis' docker infrastructure & add Travis' badge
 2015-01-27 08:55:16 -05:00
Dale Wijnand
137050a69c Specify openjdk6. 2015-01-27 09:49:35 +00:00
Dale Wijnand
a8e2343086 Switch to Travis' docker infrastructure. 2015-01-27 09:37:54 +00:00
Dale Wijnand
22890b6e9f Add TravisCI badge. 2015-01-27 09:20:19 +00:00
Havoc Pennington
ac09c7e33d Merge pull request #244 from dwijnand/cleanup-build 
Cleanup build
 2015-01-26 20:45:51 -05:00
Dale Wijnand
65ff5f9f2c Replace JavaVersionCheck with sbt-javaversioncheck. 2015-01-27 00:35:39 +00:00
Dale Wijnand
ad63b52073 Cleanup Build.scala. 2015-01-27 00:35:39 +00:00
Dale Wijnand
840bb0dc58 Cleanup sbt 0.13.7+ build.sbt format. 2015-01-27 00:35:39 +00:00
Dale Wijnand
3cb10e6879 Scala 2.10.4 (this build only). 2015-01-27 00:35:39 +00:00
Dale Wijnand
8e82860df7 Delete empty build.sbt files. 2015-01-26 23:57:36 +00:00
Wu Zhenwei
7c91260a70 Fix function name in scala and comments. 2015-01-25 12:46:01 +08:00
Wu Zhenwei
4a8e1023a3 Rename set functions to with. 2015-01-25 12:33:52 +08:00
Wu Zhenwei
a0f2e49a85 Add methods to create and set origin. 2015-01-24 21:44:37 +08:00
Lunfu Zhong
5bbebb783d Update README.md 
Add new scala wrapper
 2015-01-24 20:46:58 +08:00
Havoc Pennington
5174c92df0 Merge pull request #222 from typesafehub/wip/havocp-resolve-fixes 
Rewrite resolver to be more comprehensible
 2015-01-20 20:12:53 -05:00
Havoc Pennington
8b0bcc6e51 Merge pull request #226 from paulp/null 
Test case bug.
 2015-01-07 09:40:21 -05:00
Paul Phillips
f38a7b027a Test case bug. 
It's intended to be testing the reference.
 2015-01-02 13:20:03 -08:00
Havoc Pennington
597452cac0 Remove some dead code 2014-12-27 21:13:17 -05:00
Havoc Pennington
1afaea55a8 Merge remote-tracking branch 'origin/master' into wip/havocp-resolve-fixes 
Conflicts:
	config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java
 2014-12-27 16:45:44 -05:00
Havoc Pennington
197be59fec Merge pull request #173 from typesafehub/wip/havocp-out-of-range-bytes 
Throw an exception if size-in-bytes values are out of Long range
 2014-12-27 13:43:51 -08:00
Havoc Pennington
94dda5f9cf If not allowing unresolved, optimize resolve status computation for List 2014-12-27 16:41:47 -05:00
Havoc Pennington
51d94fc357 Merge pull request #180 from tea-dragon/master 
Fix 'allow unresolved' for at least two list cases
 2014-12-27 13:35:34 -08:00
Havoc Pennington
6c96f2eaa3 Merge pull request #184 from alexwei/master 
Added missing duration unit short names that are supported in scala and more
 2014-12-27 13:34:11 -08:00
Havoc Pennington
9e719711c3 Merge branch 'master' of https://github.com/Kornel/config into Kornel-master 
Conflicts:
	README.md
 2014-12-27 16:32:03 -05:00
Havoc Pennington
485f910d55 Change expected result of delayedMergeObjectResolveProblem5 
Our "do not look at what we're resolving in order to resolve it"
algorithm is now more robust so we get a different answer.
 2014-12-27 16:26:52 -05:00
Havoc Pennington
53d642d93f Fix warning about use of octal escape in string literal 2014-12-27 16:06:40 -05:00
ian
ed19f4c09e isolate test for allowing unresolved list elements 2014-12-24 16:10:20 -05:00
ian
3c6488fbc2 Fix 'allow unresolved' for at least two list cases 
lists did not respond well to cases where only some of their
elements were resolved or even when none of them were resolved
but one of their object identities happened to change. Previously
this would throw a nasty 'bug or broken' exception so it seems
unlikely to have unintended side effects.
 2014-12-24 15:41:34 -05:00
Havoc Pennington
5c464b3b5a Document ConfigFactory.parseFile 2014-12-18 15:13:03 -05:00
Havoc Pennington
c176bdcf50 Merge pull request #216 from chimpler/master 
Updated README.md to add link to python port (pyhocon)
 2014-12-07 23:11:31 -05:00
Francois Dang Ngoc
5447501df0 updated README.md to add link to python port (pyhocon) 2014-12-07 22:52:32 -05:00
Havoc Pennington
0a96f9f3b4 Merge pull request #215 from benmccann/minor-upgrades 
Upgrade to SBT 0.13.6
 2014-12-01 22:39:18 -05:00
Ben McCann
54e780d308 Upgrade to SBT 0.13.7 2014-12-01 17:54:55 -08:00
Havoc Pennington
f3ec3aa910 Missing backtick in HOCON.md 
Reported by @takc923
 2014-11-11 14:49:47 -05:00
Havoc Pennington
741b14ec6b Merge pull request #210 from chris-martin/pull-quoted-string-do-while 
Avoid awkward do-while in Tokenizer.pullQuotedString
 2014-11-07 09:23:32 -05:00
Chris Martin
b83089b91d Avoid awkward do-while in Tokenizer.pullQuotedString 
Not a big deal, but I think this reads more clearly now.
 2014-11-05 14:36:40 -05:00
Havoc Pennington
c3325a8966 Remove "root" from MemoKey 
This was just wrong in the new setup; we change the root constantly.
The MemoKey should be per-conceptual-resolve which is per-ResolveContext,
not per-root.

This commit fixes the tests in which we failed to memoize
and thus got different results for the same ConfigReference
at different times in the resolution process.

But it breaks ConfigSubstitutionTest.avoidDelayedMergeObjectResolveProblem5.
 2014-10-22 14:28:44 -04:00
Havoc Pennington
1a65f861b2 ConfigDelayedMerge.java: Fix indentation 2014-10-22 13:59:06 -04:00
Havoc Pennington
da494cd8a0 Spec: must memoize when resolving substitutions 2014-10-22 13:59:06 -04:00
Havoc Pennington
0a828f500b Implement equals and hashCode for ResolveSource 
Useful for debugging or whatever.
 2014-10-22 13:58:44 -04:00
Havoc Pennington
c8f42ef92d Make ResolveContext immutable 
This is a mechanical refactoring not intended to change behavior.
Not very efficiently implemented but that's fine for now.
 2014-10-13 11:24:52 -04:00
Havoc Pennington
afdcbb3803 Merge remote-tracking branch 'origin/master' into wip/havocp-resolve-fixes 2014-10-13 05:52:18 -04:00
Havoc Pennington
5038949cff README: recommend hasPath rather than catching Missing 2014-10-13 05:49:46 -04:00
Havoc Pennington
0a7db6a126 Avoid PathBuilder for fast-path path parsing 
This makes the typical path parse much faster:
 - avoid Character.isLetter in favor of just ASCII alphanumeric
 - allow fast path with hyphens and underscores involved
 - don't use PathBuilder, build a Path directly by
   traversing the string backward; this avoids some
   object allocation
 2014-10-13 05:22:38 -04:00
Havoc Pennington
c5b2572858 Change CatchExceptionOnMissing bench to have more stack frames 2014-10-11 10:52:00 -04:00