Changes to be committed:
	modified:   README.md
	modified:   salt/conf/minion
	new file:   salt/keystone/file/admin-openrc.sh
	modified:   salt/keystone/file/keystone.conf
	new file:   salt/keystone/init.sls
	deleted:    salt/keystone/keystone.sls
	modified:   salt/keystone/keystone.sls~
	new file:   salt/mysql/create.sls
	new file:   salt/mysql/file/minion
	modified:   salt/mysql/init.sls
	modified:   salt/mysql/init.sls~
	new file:   salt/mysqldb/init.sls
	modified:   salt/ntp/init.sls
	modified:   salt/rabbitmq/init.sls
	modified:   salt/top.sls
	modified:   README.md
	modified:   README.md~
Merge branch 'master' of https://github.com/trananhkma/SaltStack

Conflicts:
	README.md

 Changes to be committed:
	modified:   README.md