Second commit

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch merge_vagrant-ubuntu-oracle-xe
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   Vagrantfile
	deleted:    manifests/base.pp
	modified:   puppet/manifests/default.pp
	renamed:    modules/oracle/files/60-oracle.conf -> puppet/modules/oracle/files/60-oracle.conf
	renamed:    modules/oracle/files/S01shm_load -> puppet/modules/oracle/files/S01shm_load
	renamed:    modules/oracle/files/chkconfig -> puppet/modules/oracle/files/chkconfig
	renamed:    modules/oracle/files/oracle-env.sh -> puppet/modules/oracle/files/oracle-env.sh
	renamed:    modules/oracle/files/xe.rsp -> puppet/modules/oracle/files/xe.rsp
	renamed:    modules/oracle/manifests/init.pp -> puppet/modules/oracle/manifests/init.pp