diff options
| author | Max Martin <max@puppetlabs.com> | 2011-06-02 15:29:31 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-06-02 15:29:31 -0700 |
| commit | 284113707fa07c6abcbb765dcd6d8c24e1b6b5fa (patch) | |
| tree | ce31cee8a359e0bb707dc563329acf95c015566d /lib/puppet/rails/rails_resource.rb | |
| parent | 2f8bc2688ee5a612e5a7f6381ba181f49857cc03 (diff) | |
| parent | 805b2878d0b23d76917f5210abe35489f6f84c74 (diff) | |
| download | puppet-284113707fa07c6abcbb765dcd6d8c24e1b6b5fa.tar.gz puppet-284113707fa07c6abcbb765dcd6d8c24e1b6b5fa.tar.xz puppet-284113707fa07c6abcbb765dcd6d8c24e1b6b5fa.zip | |
Merge branch '2.6.x' into 2.7.x
* 2.6.x:
(#5318) Always notice changes to manifests when compiling.
(#7681) Add an acceptance test for resource refs with array variables
Conflicts (manually resolved):
lib/puppet/parser/compiler.rb
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions