Merge pull request #93 from paramite/icehouse-sync

Icehouse sync
redhat-openstack · Sep 2, 2014 · e518576 · e518576
2 parents 204c129 + 7133993
commit e518576
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/apache b/apache
diff --git a/cinder b/cinder
diff --git a/concat b/concat
diff --git a/gluster b/gluster
diff --git a/nova b/nova
diff --git a/puppet b/puppet
diff --git a/vswitch b/vswitch
+2 −0		manifests/mod/ssl.pp
+0 −7		manifests/params.pp
+9 −2		manifests/version.pp
+1 −1		spec/acceptance/apache_parameters_spec.rb
+1 −1		spec/acceptance/apache_ssl_spec.rb
+1 −1		spec/acceptance/basic_spec.rb
+1 −1		spec/acceptance/class_spec.rb
+1 −1		spec/acceptance/default_mods_spec.rb
+13 −15		spec/acceptance/itk_spec.rb
+1 −1		spec/acceptance/mod_php_spec.rb
+1 −1		spec/acceptance/mod_suphp_spec.rb
+2 −4		spec/acceptance/prefork_worker_spec.rb
+1 −1		spec/acceptance/service_spec.rb
+13 −0		spec/acceptance/unsupported_spec.rb
+0 −2		spec/acceptance/version.rb
+19 −5		spec/acceptance/vhost_spec.rb
+3 −3		spec/spec_helper_acceptance.rb
+7 −0		.fixtures.yml
+1 −0		.gitattributes
+7 −0		.gitignore
+1 −0		.sync.yml
+17 −0		.travis.yml
+103 −5		CHANGELOG
+234 −0		CONTRIBUTING.md
+27 −0		Gemfile
+14 −0		LICENSE
+9 −0		Modulefile
+0 −103		README.markdown
+443 −0		README.md
+10 −0		Rakefile
+138 −0		files/concatfragments.rb
+35 −25		files/concatfragments.sh
+0 −0		files/null/.gitignore
+11 −0		lib/facter/concat_basedir.rb
+119 −47		manifests/fragment.pp
+221 −165		manifests/init.pp
+59 −32		manifests/setup.pp
+101 −0		spec/acceptance/backup_spec.rb
+204 −0		spec/acceptance/concat_spec.rb
+230 −0		spec/acceptance/deprecation_warnings_spec.rb
+24 −0		spec/acceptance/empty_spec.rb
+134 −0		spec/acceptance/fragment_source_spec.rb
+57 −0		spec/acceptance/newline_spec.rb
+19 −0		spec/acceptance/nodesets/aix-71-vcloud.yml
+10 −0		spec/acceptance/nodesets/centos-59-x64.yml
+12 −0		spec/acceptance/nodesets/centos-64-x64-pe.yml
+10 −0		spec/acceptance/nodesets/centos-64-x64.yml
+10 −0		spec/acceptance/nodesets/centos-65-x64.yml
+10 −0		spec/acceptance/nodesets/debian-607-x64.yml
+10 −0		spec/acceptance/nodesets/debian-70rc1-x64.yml
+11 −0		spec/acceptance/nodesets/debian-73-x64.yml
+10 −0		spec/acceptance/nodesets/default.yml
+10 −0		spec/acceptance/nodesets/fedora-18-x64.yml
+10 −0		spec/acceptance/nodesets/sles-11-x64.yml
+10 −0		spec/acceptance/nodesets/sles-11sp1-x64.yml
+10 −0		spec/acceptance/nodesets/ubuntu-server-10044-x64.yml
+10 −0		spec/acceptance/nodesets/ubuntu-server-12042-x64.yml
+11 −0		spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+137 −0		spec/acceptance/order_spec.rb
+33 −0		spec/acceptance/quoted_paths_spec.rb
+241 −0		spec/acceptance/replace_spec.rb
+32 −0		spec/acceptance/symbolic_name_spec.rb
+97 −0		spec/acceptance/warn_spec.rb
+6 −0		spec/spec.opts
+1 −0		spec/spec_helper.rb
+39 −0		spec/spec_helper_acceptance.rb
+84 −0		spec/unit/classes/concat_setup_spec.rb
+267 −0		spec/unit/defines/concat_fragment_spec.rb
+380 −0		spec/unit/defines/concat_spec.rb
+18 −0		spec/unit/facts/concat_basedir_spec.rb
+19 −0		tests/fragment.pp
+7 −0		tests/init.pp
+0 −1		.gitignore
+17 −14		.gitmodules
+97 −7		DOCUMENTATION.md
+1 −1		Modulefile
+1 −0		README
+1 −1		VERSION
+0 −148		builder/Makefile
+4 −7		builder/README
+0 −57		builder/Vagrantfile
+0 −7		builder/files/cleanup.sh
+ −		builder/files/epel-release-6-8.noarch.rpm
+0 −40		builder/files/network.sh
+0 −1		builder/files/password
+ −		builder/files/puppetlabs-release-el-6.noarch.rpm
+0 −10		builder/files/selinux
+0 −58		builder/files/ssh.sh
+0 −16		builder/files/user.sh
+0 −13		builder/versions/template.sh
+5 −0		data/common.yaml
+9 −0		data/hiera.yaml
+9 −0		data/tree/Debian.yaml
+4 −0		data/tree/Debian/Debian.yaml
+4 −0		data/tree/Debian/Debian/7.4.yaml
+4 −0		data/tree/Debian/Ubuntu.yaml
+4 −0		data/tree/Debian/Ubuntu/12.04.yaml
+4 −0		data/tree/Gentoo.yaml
+5 −0		data/tree/RedHat.yaml
+4 −0		data/tree/RedHat/CentOS.yaml
+4 −0		data/tree/RedHat/CentOS/6.5.yaml
+20 −0		data/tree/RedHat/Fedora.yaml
+4 −0		data/tree/RedHat/Fedora/20.yaml
+4 −0		data/tree/RedHat/RedHat.yaml
+4 −0		data/tree/RedHat/RedHat/6.5.yaml
+6 −0		data/tree/RedHat/RedHat/7.0.yaml
+0 −0		files/xml.py
+11 −2		lib/facter/gluster_ports.rb
+16 −3		lib/facter/gluster_uuid.rb
+8 −1		lib/facter/gluster_version.rb
+14 −9		manifests/api.pp
+19 −18		manifests/brick.pp
+4 −1		manifests/brick/ext4.pp
+4 −1		manifests/brick/xfs.pp
+22 −20		manifests/host.pp
+10 −1		manifests/mount.pp
+17 −6		manifests/mount/base.pp
+83 −0		manifests/params.pp
+3 −1		manifests/repo.pp
+13 −9		manifests/server.pp
+19 −18		manifests/volume.pp
+4 −1		manifests/volume/ping.pp
+4 −3		manifests/volume/property.pp
+14 −11		manifests/xml.pp
+ −		puppet-gluster-documentation.pdf
+0 −0		vagrant/.gitignore
+48 −13		vagrant/Vagrantfile
+0 −1		vagrant/gluster/puppet/modules/puppet
+0 −0		vagrant/puppet/files/README
+0 −0		vagrant/puppet/hiera.yaml
+0 −0		vagrant/puppet/hieradata/common.yaml
+35 −0		vagrant/puppet/manifests/site.pp
+0 −0		vagrant/puppet/modules/.gitignore
+4 −2		vagrant/puppet/modules/Makefile
+0 −0		vagrant/puppet/modules/README
+0 −0		vagrant/puppet/modules/apt
+0 −0		vagrant/puppet/modules/common
+0 −0		vagrant/puppet/modules/keepalived
+1 −0		vagrant/puppet/modules/module-data
+1 −0		vagrant/puppet/modules/puppet
+0 −0		vagrant/puppet/modules/shorewall
+0 −0		vagrant/puppet/modules/stdlib
+0 −0		vagrant/puppet/modules/yum
+2 −1		README
+1 −0		manifests/common.pp
+38 −0		manifests/facter.pp