Merge branch 'hotfix/vagrant-box' into develop

Forward port #105
zfcampus · Jul 23, 2015 · cabaaac · cabaaac
2 parents 3af7ce0 + efb540d
commit cabaaac
Show file tree

Hide file tree

Showing 2,746 changed files with 136,999 additions and 15,326 deletions.
diff --git a/.puppet/files/dot/.bash_aliases b/.puppet/files/dot/.bash_aliases
diff --git a/.puppet/manifests/default.pp b/.puppet/manifests/default.pp
diff --git a/.puppet/modules/apache/.fixtures.yml b/.puppet/modules/apache/.fixtures.yml
diff --git a/.puppet/modules/apache/.gemfile b/.puppet/modules/apache/.gemfile
diff --git a/.puppet/modules/apache/Modulefile b/.puppet/modules/apache/Modulefile
diff --git a/.puppet/modules/apache/README.md b/.puppet/modules/apache/README.md