Merge branch 'master' of github.com:pentagramacs/memcached-formula

Browse Source

Conflicts:
	memcached/map.jinja
	pillar.example

...

This commit is contained in:

Victor Moura 2016-08-08 18:51:36 -03:00

parent 0389813729 0095b5b39d

commit 683bf00dba

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available