Commit Graph

67761 Commits

Author SHA1 Message Date
justinta89
0ecec691a0 Adjusted beacons to work with enumerate better 2016-03-14 14:33:32 -06:00
Nicole Thomas
d357e4ea44 Merge pull request #31857 from sjorge/solarish_shadow
gen_password and del_password missing from solaris_shadow
2016-03-14 14:29:50 -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
Nicole Thomas
1b0b2d3f1a Merge pull request #31879 from cro/idrac_fixes_0314
Clarify some comments
2016-03-14 13:59:35 -06:00
Jorge Schrauwen
38231303f3 .9 release as mentioned by rallytime 2016-03-14 19:41:20 +00:00
Jorge Schrauwen
3e25f70968 fix version added 2016-03-14 19:39:54 +00:00
C. R. Oldham
42ef3a7970 Extra comment. 2016-03-14 13:12:06 -06:00
rallytime
44b29f72a1 Make sure __virtual__ error message is helpful when psutil is missing
Fixes #19659
Fixes #31867
2016-03-14 12:33:53 -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
fb81bbea23 Merge pull request #31815 from dr4Ke/fix_template_on_contents_2015.8
Fix template on contents 2015.8
2016-03-14 11:41:46 -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
justinta89
f509b4113e Fixed final lint error 2016-03-14 11:28:40 -06:00
Mike Place
aa120cb716 Merge pull request #31818 from alprs/fix-event_logging_spam
Prevent event logs from writing huge amounts of data
2016-03-14 11:27:47 -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
justinta89
5945b3f11f Fix and disable pylint errors 2016-03-14 10:38:07 -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
justinta89
06ae6eaf55 Fixed pylint errors on jboss state and module 2016-03-14 10:34:51 -06: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
Mike Place
f2445bdbdc Merge pull request #31836 from terminalmage/issue31293
Fix git_pillar race condition
2016-03-14 09:48:28 -06:00
justinta89
de96db97c8 Fixed more pylint errors, and disabled some more 2016-03-14 09:42:08 -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
Daniel Hobley
4d75b817af Lint fixes 2016-03-14 09:32:45 +01:00
rajvidhimar
830e270a93 fixed spacing issues 2016-03-14 11:41:30 +05:30
rajvidhimar
0d214586d8 updated states 2016-03-14 11:41:30 +05:30
rajvidhimar
bfb8a9212c added junos state module and added more functionalities to junos module 2016-03-14 11:41:30 +05:30
Nicole Thomas
5464be07b1 Merge pull request #31824 from rallytime/bp-31819
Back-port #31819 to 2015.8
2016-03-13 13:59:32 -06:00
Nicole Thomas
7781b357e0 Merge pull request #31856 from szeestraten/add-missing-docs-for-azure-cloud-profile
Adds missing docs for Virtual Network and Subnet options in salt-cloud Azure cloud profile
2016-03-13 13:06:52 -06:00
Jorge Schrauwen
d768ed25b4 develop, 2016.3 and 2015.8 has missing gen_password and del_password for shadow module 2016-03-13 15:33:37 +00:00
Sandor Zeestraten
a1a2229405 Adds missing docs for Azure cloud profile
Adds documentation for feature introduced in #24559 in salt-cloud
to specify virtual network and subnet in the Azure cloud profile.
2016-03-13 14:27:49 +01:00
Nicole Thomas
aed7d2abb1 Merge pull request #31853 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-12 20:00:31 -07:00
Nicole Thomas
5c592b6768 Merge pull request #31852 from rallytime/merge-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2016-03-12 19:47:02 -07:00
rallytime
54c76ebf33 Merge branch '2015.8' into '2016.3' 2016-03-12 19:12:08 -07:00