Commit Graph

2 Commits

Author SHA1 Message Date
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
rallytime
c287e6db55 Created GitHub Issue and PR templates 2016-02-24 16:05:00 -07:00