summaryrefslogtreecommitdiffstats
path: root/spec/unit/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-02-11 13:51:48 -0600
committerLuke Kanies <luke@madstop.com>2009-02-11 13:51:48 -0600
commita2270b4a4f093c6c4f171dcf0c0e05fe101dd979 (patch)
treef0d893dfe6fe13c8c9e0670c1e5459ec336318ba /spec/unit/network
parent9bac833dcfdd8d6a00188faee0487e787b7a0101 (diff)
parent6b0c1b9170c69829bdf5956d1dec0949dcc08b35 (diff)
downloadpuppet-a2270b4a4f093c6c4f171dcf0c0e05fe101dd979.tar.gz
puppet-a2270b4a4f093c6c4f171dcf0c0e05fe101dd979.tar.xz
puppet-a2270b4a4f093c6c4f171dcf0c0e05fe101dd979.zip
Merge branch '0.24.x'
Conflicts: CHANGELOG spec/unit/type/file/selinux.rb
Diffstat (limited to 'spec/unit/network')
0 files changed, 0 insertions, 0 deletions