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
Bo Maryniuk
a713bd6f55
Initial module for XFS support
2014-10-29 21:52:58 +01: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
Colton Myers
96caa86ac5
Fix typo
2014-10-29 11:29:04 -06:00
Colton Myers
81728f83f7
Disable compound/pillar targeting for peer, minion-side
2014-10-29 11:27:31 -06:00
Mike Place
bebf14ed31
Merge branch '2014.7' of https://github.com/saltstack/salt into develop
2014-10-29 11:25:48 -06:00
Colton Myers
046d7aafe9
Disable pillar/compound for mine.get, master-side
2014-10-29 11:25:23 -06:00
Colton Myers
868fdc86da
Disable compound matching for pillar.get, minion-side
2014-10-29 11:21:13 -06:00
Colton Myers
12b71bdc59
Disable pillar/compound matching for peer interface, master-side
2014-10-29 11:18:03 -06:00
Seth House
06e1fe69bd
Merge pull request #16993 from felskrone/expose_connected_minions
...
Expose connected minions through wheel-api
2014-10-29 12:03:35 -05:00
Erik Johnson
340bdb7a93
Merge pull request #16865 from sbworth/bworth-devel
...
Provide the ability to pass environment variables into pip build process
2014-10-29 10:10:15 -06:00
Joseph Hall
03357d2392
Merge pull request #16994 from dmyerscough/drac
...
Additional functionality for Dell DRAC's
2014-10-29 09:55:29 -06:00
vs
24c12c5866
pylint
2014-10-29 16:42:50 +01:00
Matthew Hopkins
b7d501d32b
Removes invalid BUFFSIZE argument from sc query / sc qc
2014-10-29 11:40:38 -04:00
Matthew Hopkins
0b1a72c1c5
Fix to handle another error (function not implemented) generated when copying files on an SMB share from an OS X host.
2014-10-29 11:14:36 -04:00
Damian Myerscough
1cc350e108
Power actions reboot/poweron/poweroff/hardrest & set the system to PXE boot
2014-10-29 08:14:08 -07:00
vs
7d84f116e3
fix formatting
2014-10-29 14:37:18 +01:00
vs
4beb56bdbb
add wheel.minions to wheel-index
2014-10-29 14:35:13 +01:00
vs
eac2123381
its for all minions, not just con_cache
2014-10-29 14:20:14 +01:00
vs
9e63712488
add documentation for wheel.minions
2014-10-29 14:18:23 +01:00
vs
4fbb714ac9
expose connected minions through wheel-api
2014-10-29 14:10:20 +01:00
Daniel Hobley
f2d89c0b5c
#16991 Fixed pylint issues
2014-10-29 13:18:58 +01:00
Daniel Hobley
7c4414cd7a
Added the ability to mount on OS X
...
- This uses the /etc/auto_master config to setup persistent mounts (always as the user running salt)
- As of right now only the root user can read the mount if it's mounted persistently (I recommend simply running this as another user and not persisting)
- Replaces the defaults setting to noowners on OS X
2014-10-29 12:22:36 +01:00
Pedro Algarvio
cb19ad0ca3
Fix syntax error
2014-10-29 06:28:09 +00:00
Ethan Moore
bdf5741bc9
Added 'adduser', 'deluser', and 'members' functions. Changed all code to use ADSI, instead of 'net localgroup'
2014-10-28 23:58:36 -05:00
Mike Place
e243a650cd
Merge pull request #16984 from mbrukman/clouds-gce-fix-indent
...
Increase indentation to fix code formatting.
2014-10-28 19:44:29 -06:00
Misha Brukman
910da90b0c
Increase indentation to fix code formatting.
2014-10-28 21:06:52 -04:00
Thomas Jackson
f997d24cfa
Change syndic_wait in get_iter_returns
...
This will ensure we only do the quick return if you are *not* a syndic, since when you are a syndic we have no idea what the target is-- so we have to wait. This means that syndic masters (the master of masters) will have at least syndic_wait seconds until the return comes back
2014-10-28 17:19:43 -07:00
David Boucha
a637c12156
fix pylint error
2014-10-28 17:27:25 -06:00
David Boucha
c5261c2097
add comment that ':' is illegal on Windows
...
Windows file paths and names cannot contain a ':'
2014-10-28 16:47:51 -06:00
