summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/files.rb
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-04-12 05:15:00 +1000
committerJames Turnbull <james@lovedthanlost.net>2011-04-12 05:15:00 +1000
commitdce851cac79393f86950f4ebfc48b9ac67dcd8f7 (patch)
treecd2a4a92183b43eba985633f34de6557937b9e37 /lib/puppet/parser/files.rb
parent46d67fd86819d1dfe4813f22b192213985e3a587 (diff)
parent49dcc24195d262437cc35997a811eb724d65b48b (diff)
downloadpuppet-dce851cac79393f86950f4ebfc48b9ac67dcd8f7.tar.gz
puppet-dce851cac79393f86950f4ebfc48b9ac67dcd8f7.tar.xz
puppet-dce851cac79393f86950f4ebfc48b9ac67dcd8f7.zip
Merge branch 'tickets/master/7021' into next
* tickets/master/7021: Updated confine in Spec test for RSpec 2 Add management of router/switchs global vlans Cisco Switch/Router Interface management Base class for network device based providers Ssh transport for network device management Telnet transport to connect to remote network device Remote Network Device transport system Introduce a module for some IP computations
Diffstat (limited to 'lib/puppet/parser/files.rb')
0 files changed, 0 insertions, 0 deletions