Commit Graph

67582 Commits

Author SHA1 Message Date
Jeremy Rosenbaum
bf05546d00 move clients list to netapi module constant 2016-03-15 21:18:21 -07:00
Seth House
2c2f7dc808 Add slsutil.renderer execution function 2016-03-15 18:30:35 -06:00
Mike Place
0ef623f6fa Merge pull request #31908 from Ashald/feature/state-orchestrate-pillarenv
Allow passing pillarenv into state.orchestrate
2016-03-15 16:18:20 -06:00
Mike Place
1b65b48ac3 Merge pull request #31877 from alprs/fix-salt_ssh_log
Set option.explicit when passing from Saltfile
2016-03-15 16:16:26 -06:00
Mike Place
bbd00db445 Merge pull request #31909 from saravanakumar-periyasamy/develop
#31899: Added the identifier parameter to get_records, update_records…
2016-03-15 16:07:35 -06:00
Mike Place
62e43a6a77 Merge pull request #31847 from sakateka/multimaster_with_type_func
Add ability to multimaster mode with master_type = func
2016-03-15 15:40:58 -06:00
Perry Zipoy
6656f78bbd Clean non-applicable SMBIOS info for serial, part, and version matches
When cleaning out well-known bogus values from a DMI contents, this
change adds a filter for values containing the string "applicable" for
the serial number (as well as "part" and "version" matches). For
example, if "Not Applicable" is returned from SMBIOS for the serial
number (DMI string "system-serial-number"), this change will not allow
the string "Not Applicable" from being saved as the grain value.

Signed-off-by: Perry Zipoy <perry.zipoy@ni.com>
2016-03-15 16:12:14 -05:00
Mike Place
ef1c9863f3 Merge pull request #31777 from jettero/develop
reliably detect duplicate keys during batch (or at least not crash)
2016-03-15 14:36:32 -06:00
Mike Place
30241f53bc Merge pull request #31910 from cachedout/doc_31832
Docs for stand-alone minion
2016-03-15 13:53:31 -06:00
Mike Place
1c2e8e0828 Docs for stand-alone minion
Refs #31832
2016-03-15 13:52:09 -06:00
Mike Place
b0f1846259 Merge pull request #31832 from adelcast/dev/adelcast/disable_master_2
add disable option to 'master_type' minion config token
2016-03-15 13:51:02 -06:00
Mike Place
7339f84af1 Merge pull request #31817 from rajvidhimar/enhance-junos
Enhance junos
2016-03-15 13:45:40 -06:00
Saravana Periyasamy
f35413dc9e #31899: Added the identifier parameter to get_records, update_records & delete_records, and returned the identifier as part of the ret['changes']. 2016-03-15 14:21:34 -05:00
Borys Pierov
336242fa12 Allow passing pillarenv into state.orchestrate 2016-03-15 14:58:42 -04:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable
Hotfix/windows proxy enable
2016-03-15 12:58:33 -06:00
Mike Place
3a0f1f69b3 Merge pull request #31898 from afletch/patch-1
Ensure rh_service not used on CloudLinux 7
2016-03-15 12:47:19 -06:00
Nicole Thomas
4f7aad7be5 Merge pull request #31882 from jacobhammons/rel-notes
Updated release notes & module reference
2016-03-15 10:56:36 -06:00
Nicole Thomas
80feff9596 Merge pull request #31896 from cachedout/doc_31794
Add docs for master_tries
2016-03-15 10:01:21 -06:00
afletch
4300266374 Ensure rh_service not used on CloudLinux 7
Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7
2016-03-15 15:42:45 +00:00
Mike Place
64ca65954a Add docs for master_tries
Refs #31794
2016-03-15 09:29:13 -06:00
Mike Place
8f1ceb7eda Merge pull request #31794 from skizunov/develop2
Add `master_tries` config option for minions
2016-03-15 09:24:49 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Daniel Hobley
4884844ad6 Only include state changes if something actually happened 2016-03-15 12:00:41 +01:00
Jacob Hammons
fd7f7bcddf Updated release notes
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
2016-03-14 16:34:22 -06:00
Mike Place
908b4446b0 Merge pull request #31808 from lyft/reenable-disabled-user
Allow for users to set expiration date of -1.
2016-03-14 16:29:12 -06:00
Nicole Thomas
3702e7aff0 Merge pull request #31876 from gtmanfred/develop
OS-EXT-IPS:type is not always defined on addresses
2016-03-14 14:00:16 -06:00
Daniel Wallace
aef4978a6f default floating_ip config should be a dict 2016-03-14 12:24:52 -06:00
Nicole Thomas
2c0edf25fd Merge pull request #31874 from rallytime/fix-doc-errors
Fix doc test errors for boto_datapipeline and boto_iot modules
2016-03-14 12:19:03 -06:00
Nicole Thomas
a552634123 Merge pull request #31809 from preoctopus/develop
Remove getval as it's deprecated
2016-03-14 12:15:31 -06:00
Nicole Thomas
2379247b2a Merge pull request #31875 from cachedout/remove_mine_tests
Remove useless mine tests
2016-03-14 12:15:04 -06:00
Andreas Lutro
2aceacdfcb set option.explicit when passing from Saltfile
fixes #27491
2016-03-14 19:05:13 +01:00
Daniel Wallace
90fe817bde OS-EXT-IPS:type is not always defined on addresses
In novaclient servers
2016-03-14 12:04:25 -06:00
Mike Place
38e40d4492 Merge pull request #31798 from mchugh19/patch-1
Create salt-proxy instantiated service file
2016-03-14 11:52:05 -06:00
Mike Place
8e540af197 Remove useless mine tests
These are so heavily mocked that they test nothing.
2016-03-14 11:35:42 -06:00
Nicole Thomas
af491363bf Merge pull request #31872 from kraney/boto_iam
Fix buggy state updates to attached user/group/role policies.
2016-03-14 11:29:06 -06:00
Mike Place
b63edcd01a Merge pull request #31870 from gtmanfred/develop
specify defaults for reactor in salt/config
2016-03-14 11:19:48 -06:00
rallytime
51c4840bde Update CLI Examples for boto_iot module 2016-03-14 11:13:13 -06:00
rallytime
c81ee0c3f8 Update CLI Examples for boto_datapipeline module 2016-03-14 11:04:15 -06:00
Mike Place
4adc25b3b3 Merge pull request #31830 from Unity-Technologies/hotfix/keychain-cert-changed
Hotfix/keychain cert changed
2016-03-14 10:59:54 -06:00
Kris Raney
002f9c8002 Fix buggy state updates to attached user/group/role policies.
Was always running whether needed or not. Also, failed for some ways of specifying credentials.
2016-03-14 11:35:11 -05:00
Mike Place
5bcd923589 Merge pull request #31868 from mirceaulinic/CF-NAPALM-NET
Better documentation and more functions for NAPALM proxy and NAPALM_NET module
2016-03-14 10:29:14 -06:00
Daniel Wallace
849e269a75 specify defaults for reactor in salt/config 2016-03-14 09:50:54 -06:00
Nicole Thomas
86a3fc24ef Merge pull request #31838 from lomeroe/boto_vpc-subnet_present-route_table
allow boto_vpc.subnet_present state to manage a subnet's explicitly associated route table
2016-03-14 09:39:18 -06:00
Thomas S Hatch
88b8a0980c Merge pull request #31807 from gtmanfred/develop
Add reactor as an engine
2016-03-14 09:29:33 -06:00
Mike Place
8268e9b289 Merge pull request #31846 from cro/proxy_infinite_loop
Proxy infinite loop
2016-03-14 09:17:13 -06:00
Mircea Ulinic
439acb6562 Added facts() and environment() 2016-03-14 14:56:31 +00:00
Mircea Ulinic
75ee83fe58 Better documentation and more functions 2016-03-14 14:22:42 +00:00
C. R. Oldham
c739127ac5 Extra comment. 2016-03-14 07:15:46 -06:00
C. R. Oldham
5366daafa8 Fix event bus flood caused by unexpected recursive call. 2016-03-14 07:15:46 -06:00
rajvidhimar
a802663ad9 edited modules 2016-03-14 15:09:17 +05:30