diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 10:46:57 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 10:46:57 -0800 |
| commit | 7aeeae3721f105d99a5cdd2e8110315791fd40bd (patch) | |
| tree | 679b54fc45b775f0fdc705b28e4a5f1f923f803c /lib/puppet/parser/functions/parsejson.rb | |
| parent | aa9948bfb32c4d88a04f24586224b628b5be0c8d (diff) | |
| parent | bdba42dbb6328ccc5bb13f0777240fdb85e538ca (diff) | |
Merge branch 'v2.x'
* v2.x:
Docs: Clarify the use case for the anchor type
Docs: Remove author emails from stdlib functions
Docs: Copyedit function doc strings
Docs: Correct indentation of markdown code examples
Docs: Update documentation of stdlib classes
Docs: Update file_line documentation
Docs: Improve example in merge function
Diffstat (limited to 'lib/puppet/parser/functions/parsejson.rb')
0 files changed, 0 insertions, 0 deletions