diff --git a/benchmarks/catalog_memory/puppet.conf.erb b/benchmarks/catalog_memory/puppet.conf.erb index 00e2986bf..995b11be4 100644 --- a/benchmarks/catalog_memory/puppet.conf.erb +++ b/benchmarks/catalog_memory/puppet.conf.erb @@ -1,5 +1,4 @@ confdir = <%= location %> vardir = <%= location %> environmentpath = <%= File.join(location, 'environments') %> environment_timeout = '0' -parser = future diff --git a/benchmarks/defined_types4/description b/benchmarks/defined_types4/description index f24e9bba4..a5365c934 100644 --- a/benchmarks/defined_types4/description +++ b/benchmarks/defined_types4/description @@ -1,4 +1,4 @@ -Benchmark scenario: heavy use of defined types future parser +Benchmark scenario: heavy use of defined types Benchmark target: catalog compilation Parser: Future diff --git a/benchmarks/defined_types4/puppet.conf.erb b/benchmarks/defined_types4/puppet.conf.erb index 618ea6e2f..e0c5d8588 100644 --- a/benchmarks/defined_types4/puppet.conf.erb +++ b/benchmarks/defined_types4/puppet.conf.erb @@ -1,4 +1,3 @@ confdir = <%= location %> vardir = <%= location %> environmentpath = <%= File.join(location, 'environments') %> -parser = future diff --git a/benchmarks/empty_catalog/puppet.conf.erb b/benchmarks/empty_catalog/puppet.conf.erb index 00e2986bf..995b11be4 100644 --- a/benchmarks/empty_catalog/puppet.conf.erb +++ b/benchmarks/empty_catalog/puppet.conf.erb @@ -1,5 +1,4 @@ confdir = <%= location %> vardir = <%= location %> environmentpath = <%= File.join(location, 'environments') %> environment_timeout = '0' -parser = future diff --git a/benchmarks/evaluations/puppet.conf.erb b/benchmarks/evaluations/puppet.conf.erb index d0bf4b2f1..f87ffa12e 100644 --- a/benchmarks/evaluations/puppet.conf.erb +++ b/benchmarks/evaluations/puppet.conf.erb @@ -1,6 +1,5 @@ confdir = <%= location %> vardir = <%= location %> environmentpath = <%= File.join(location, 'environments') %> environment_timeout = '0' -parser = future strict_variables = true diff --git a/benchmarks/virtual_collection/description b/benchmarks/virtual_collection/description index c0522e031..f48b5dbef 100644 --- a/benchmarks/virtual_collection/description +++ b/benchmarks/virtual_collection/description @@ -1,4 +1,4 @@ -Benchmark scenario: heavy use of virual collection with future parser +Benchmark scenario: heavy use of virual collection Benchmark target: catalog compilation Parser: Future diff --git a/benchmarks/virtual_collection/puppet.conf.erb b/benchmarks/virtual_collection/puppet.conf.erb index 618ea6e2f..0264a20c8 100644 --- a/benchmarks/virtual_collection/puppet.conf.erb +++ b/benchmarks/virtual_collection/puppet.conf.erb @@ -1,4 +1,4 @@ confdir = <%= location %> vardir = <%= location %> environmentpath = <%= File.join(location, 'environments') %> -parser = future +