 puneet kandhari
|
16ed1bd334
|
Merge pull request #169 from smlloyd/master
Only watch salt-api package if install_packages=true
|
2015-08-08 11:53:21 -05:00 |
|
|
puneet kandhari
|
2af4bf3bb5
|
Merge pull request #161 from genuss/sign_pubkey
Add options for mult-master setup
|
2015-07-27 06:58:48 -05:00 |
|
|
puneet kandhari
|
a5923a0df9
|
Merge pull request #160 from irtnog/fix-freebsd-pygit2-package
Use the py27-pygit2 package when installing pygit2 on FreeBSD
|
2015-07-24 16:11:37 -05:00 |
|
|
puneet kandhari
|
e5ad08ee1e
|
Merge pull request #156 from iggy/revert_bad
Revert bad
|
2015-07-20 17:10:56 -05:00 |
|
|
puneet kandhari
|
b04fc8c843
|
Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython
Add support for GitPython and salt-ssh on FreeBSD masters
|
2015-07-14 06:43:03 -07:00 |
|
|
puneet kandhari
|
af8c157e2b
|
Merge pull request #155 from Oro/patch-1
salt.api state fails
|
2015-07-14 06:36:15 -07:00 |
|
|
puneet kandhari
|
96d820a5a0
|
Merge pull request #152 from pcdummy/master
Fix stuff suggested by @iggy.
|
2015-07-13 13:34:56 -07:00 |
|
|
puneet kandhari
|
ac7266a515
|
Merge pull request #151 from pcdummy/master
Install cherrypy/tornado from pip only if use_pip is True for salt-api.
|
2015-07-13 13:13:16 -07:00 |
|
|
puneet kandhari
|
b90fdc6f6a
|
Merge pull request #150 from pcdummy/master
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
|
2015-07-13 07:22:04 -05:00 |
|
|
puneet kandhari
|
c21c204dd5
|
Merge pull request #147 from quixoten/fix_syntax_error
Fix syntax error
|
2015-06-19 16:42:56 -05:00 |
|
|
puneet kandhari
|
8fcb42819b
|
Merge pull request #146 from quixoten/fix_syndic
Fix syndic requisites
|
2015-06-17 11:28:28 -05:00 |
|
|
puneet kandhari
|
4eb6d87870
|
Merge pull request #144 from peterdemin/master
formulas.jinja: python 2.6 support
|
2015-06-17 09:24:31 -05:00 |
|
|
puneet kandhari
|
975dd08885
|
Merge pull request #143 from aboe76/slspath_variable
Remove hardcoded paths with {{ slspath }} variable
|
2015-06-09 16:20:47 -05:00 |
|
|
puneet kandhari
|
8d8371f19d
|
Merge pull request #139 from willshersystems/centos
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
|
2015-06-04 09:46:33 -07:00 |
|