Gareth J. Greenaway
f47ab132ca
Adding some functions for management of the Postfix mail queue
2014-10-29 22:34:00 -07:00
Hung Nguyen Viet
7423369c55
use 2 spaces only
2014-10-30 11:53:18 +07:00
Mike Place
a07978183a
Factor eauth checks into single func
2014-10-29 22:00:59 -06:00
Damian Myerscough
f863a369db
Allow a dictionary of usernames
2014-10-29 20:58:45 -07:00
Antoine Reversat
244ee45577
Conform to pep8
2014-10-29 23:57:32 -04:00
Mike Place
264e2507f2
Refactor token processing in wheel/runner
2014-10-29 21:33:39 -06:00
Antoine Reversat
e29449a896
Add a projectid configuration. Allows specifying in what project to create the VM
2014-10-29 23:05:43 -04:00
Mike Place
aa68d6f8da
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2014-10-29 20:43:38 -06:00
Mike Place
696862fa99
Lint
2014-10-29 20:43:16 -06:00
Thomas Jackson
4a01d42403
Add lock_holders function to see who holds the locks
2014-10-29 19:33:29 -07:00
Thomas Jackson
d93abbe595
Re-order some args
2014-10-29 19:21:42 -07:00
Thomas Jackson
f34344b25f
Refactor of zk_concurrency into state/module pair.
2014-10-29 19:10:13 -07:00
Pedro Algarvio
b4b064dab2
Remove the "unknown" fallback
2014-10-30 01:32:22 +00:00
Pedro Algarvio
77e7167fb0
Update to latest stable release of the bootstrap script, v2014.10.30
...
* Apply the forking patch to openSUSE git installations.
2014-10-30 01:26:54 +00:00
Mike Place
6474d56bbe
Info log messages on component startup
2014-10-29 19:11:43 -06:00
Seth House
53dae1b3e4
Merge pull request #17019 from whiteinge/doc-salt-api-2014.7-release-notes
...
Added the salt-api merge and recent additions to 2014.7 release notes
2014-10-29 18:16:16 -05:00
Seth House
36ca21de0c
Added the salt-api merge and recent additions to 2014.7 release notes
2014-10-29 18:15:03 -05:00
Mike Place
c2e96e93a5
Re-civilize maintenance functions
2014-10-29 16:41:58 -06:00
Nicole Thomas
3ea6399216
Merge pull request #17016 from rallytime/pylint
...
Pylint fix
2014-10-29 16:28:03 -06:00
rallytime
71bc658f3c
Pylint fix
2014-10-29 16:27:21 -06:00
Nicole Thomas
500afb29fe
Merge pull request #16962 from jacksontj/2014.7
...
2014.7
2014-10-29 16:19:03 -06:00
Colton Myers
91341d8d1e
Merge pull request #17015 from basepi/removevirtuallog16748
...
Don't log in __virtual__
2014-10-29 16:16:53 -06:00
Colton Myers
a9ac017cdf
Don't log in __virtual__
2014-10-29 16:16:19 -06:00
Colton Myers
bcdad4c9cf
Merge branch '2014.7' into develop
2014-10-29 16:15:42 -06:00
Nicole Thomas
549ef0066c
Merge pull request #17008 from terminalmage/issue16926
...
Fix check_cmd behavior for file.managed state
2014-10-29 16:13:09 -06:00
Mike Place
c409299e96
Merge branch 'master_maint' into maint_develop
...
Conflicts:
salt/master.py
2014-10-29 16:12:52 -06:00
Mike Place
0f39dcdccb
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2014-10-29 16:11:35 -06:00
Mike Place
d227f57c6c
Refactor master to a new Maintenance class
2014-10-29 16:11:08 -06:00
Seth House
aff7ab3f43
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-29 16:47:23 -05:00
Erik Johnson
b6465332a0
Merge pull request #17013 from whiteinge/doc-rest_cherrypy-key
...
Added missing docs for the /key rest_cherrypy entry point
2014-10-29 15:39:10 -06:00
Thomas Jackson
52f7216bea
Revert naming here too
2014-10-29 14:35:27 -07:00
Seth House
9da07584e4
Added missing docs for the /key rest_cherrypy entry point
...
Should have been part of #16706 .
2014-10-29 16:35:04 -05:00
C. R. Oldham
060cae8edc
Merge pull request #16959 from whiteinge/apache_modules-test-mode
...
Fix apache_module states to return None and changes dict in test mode
2014-10-29 17:31:39 -04:00
Samuel Smith
49626afe30
Merge pull request #17012 from SmithSamuelM/sam_dev1
...
Fixed some tests. Refresh of masters in minion join behavior resets puid so consistent behavior
2014-10-29 15:20:49 -06:00
Colton Myers
90599c520a
Merge pull request #17001 from basepi/peerminepillar
...
Disable compound/pillar matching for mine/peer
2014-10-29 14:59:44 -06:00
Thomas Jackson
6612aa808e
Revert spelling fix, since its a variable name :)
2014-10-29 13:56:44 -07:00
Nitin Madhok
10bfd6cdb6
Fixing pylint violation
2014-10-29 16:54:26 -04:00
Samuel M Smith
4b82b72702
Merge remote-tracking branch 'upstream/develop' into sam_dev1
2014-10-29 14:47:46 -06:00
Thomas Jackson
79d56c51d4
Fix bug in grains outputter
...
The grain that sets the locale_info doesn't set it in the correct namespace (at least what everyone else including the tests are expecting). This means you get traces when you do a grains.setval something like:
```
[DEBUG ] Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/salt/output/__init__.py", line 36, in display_output
display_data = get_printout(out, opts)(data).rstrip()
File "/usr/lib/python2.6/site-packages/salt/output/grains.py", line 33, in output
encoding = grains['locale_info']['defaultencoding']
KeyError: 'locale_info'
```
2014-10-29 13:47:24 -07:00
Nitin Madhok
0f108988b8
Adding ability in salt.modules.zpool.import to list available pools for import
2014-10-29 16:41:36 -04:00
Thomas Jackson
1996302399
Add a default saltenv, to match the rest
2014-10-29 13:40:31 -07:00
Samuel M Smith
f47d21d19f
Reset puid when refreshing master for minion joiner
2014-10-29 14:38:43 -06:00
Samuel M Smith
ac6d18f1b0
Fixed Typo
2014-10-29 14:38:25 -06:00
Thomas Jackson
9697685b21
Fix typo
2014-10-29 13:37:30 -07:00
Mike Place
a774266f6f
Refactor salt.utils.filecopy() out of salt.utils
...
Done to ease the use of salt.modules.selinux here. Added better checking
for selinux to fix #16999
2014-10-29 14:32:31 -06:00
Erik Johnson
957201e9e7
Fix check_cmd behavior for file.managed state
...
Resolves #16926 .
2014-10-29 14:29:05 -06:00
Nitin Madhok
687a9bdfbc
Adding ability to import zpool in salt.modules.zpool
2014-10-29 16:14:40 -04:00
Colton Myers
63e8caa650
Fix a typo and normalize tuples
2014-10-29 14:09:14 -06:00
Colton Myers
a4b66eac45
Also remove the expr_form match for compound
2014-10-29 14:05:31 -06:00
Nitin Madhok
fd57a53064
Adding ability to export zpool in salt.modules.zpool
2014-10-29 15:16:06 -04:00
