Commit Graph

28107 Commits

Author SHA1 Message Date
Samuel Smith
0da0e252b6 Merge pull request #11356 from SmithSamuelM/sam_raet_28
Clean up and refactoring
2014-03-19 13:57:15 -06:00
Samuel M Smith
db258b7fbd Merge remote-tracking branch 'upstream/develop' into sam_raet_28 2014-03-19 13:55:14 -06:00
Samuel M Smith
a397fa790c Comment out initiate failure if fqdn not match
It still logs that not a match but allows handshake to succeed nonetheless
2014-03-19 13:53:37 -06:00
Samuel M Smith
f05c025d48 Set maximum Uxd packet to 65535 as per max datagram size
Clean up error messages
2014-03-19 13:51:36 -06:00
Seth House
e5a997c02a Merge pull request #11314 from gravyboat/develop
Fixed the links to the other internal docs so they no longer try to access the https version.
2014-03-19 12:27:20 -06:00
Thomas S Hatch
374a5ba724 Merge pull request #11348 from olliewalsh/fix_10503
Stop passing **kwargs to find_job
2014-03-19 11:22:26 -06:00
Thomas S Hatch
84e46ec350 Merge pull request #11339 from gtmanfred/machine-id
Add machine-id to the grains
2014-03-19 10:39:24 -06:00
linxiao.jz
a7d2444a60 Merge branch 'develop' of https://github.com/saltstack/salt into develop
Increase syndic_master_publish_port parameters, to address the situation Top Master inconsistencies in nat port
2014-03-19 22:56:28 +08:00
linxiao.jz
9c40d172a4 Increase syndic_master_publish_port parameters, to address the situation Top Master inconsistencies in nat port 2014-03-19 22:54:43 +08:00
Ollie Walsh
3ef77f490a Stop passing **kwargs to find_job 2014-03-19 14:46:36 +00:00
Ollie Walsh
a4dd882e7e Stop passing **kwargs to find_job 2014-03-19 14:21:55 +00:00
Matthew Williams
fa3fa3a011 salt.modules.lxc: ensure lxc is running *before* call to seed.apply 2014-03-19 02:06:44 -04:00
Daniel Wallace
4739d07c37 dash is not allowed in function names
and dictionaries use : instead of , ...
2014-03-19 00:30:49 -05:00
Daniel Wallace
c341c0ebc4 Use cmd.retcode with _linux_bin_exists
instead of cmd.run and echo $?
2014-03-19 00:30:49 -05:00
Daniel Wallace
8c5c01453c pep8 fixes for grains/core.py 2014-03-19 00:30:49 -05:00
Daniel Wallace
92348abc2d Add machine-id to the grains 2014-03-19 00:30:49 -05:00
Thomas S Hatch
8af4bd6d9f Merge pull request #11343 from dlanderson/getgrouplist
Place group_names in set() before include_default, only trace log final
2014-03-18 23:30:38 -06:00
Thomas S Hatch
3d074bba21 Merge pull request #11344 from garethgreenaway/develop2
Fix to make setup.py work
2014-03-18 23:30:00 -06:00
Forrest Alvarez
cd4206b1da A few fixes to use :ref: and :formula: instead of :doc:. 2014-03-19 04:00:42 +00:00
Forrest Alvarez
1f3dc36834 Merge remote branch 'upstream/develop' into develop 2014-03-19 04:00:02 +00:00
Thomas S Hatch
0ad04b7d2b Merge pull request #11342 from techhat/etcd
Turn the etcd returner into an external job cache
2014-03-18 21:47:23 -06:00
Thomas S Hatch
91faf89e1b Merge pull request #11336 from garethgreenaway/develop
changing the send_msg function to adhere to the salt coding style.
2014-03-18 21:45:28 -06:00
Gareth J. Greenaway
b6f9701609 change in InstallLib assumes build/lib/salt and looks for a file based on that assumption. on certain platforms this fails and causes the setup.py to fail. 2014-03-18 20:38:42 -07:00
Forrest Alvarez
3683e9de25 Merge remote branch 'upstream/develop' into develop 2014-03-19 03:29:26 +00:00
Gareth J. Greenaway
19f5d19f1f change in InstallLib assumes build/lib/salt and looks for a file based on that assumption. on certain platforms this fails and causes the setup.py to fail. 2014-03-18 20:27:48 -07:00
David Anderson
ac4dcf30f3 Place group_names in set() before include_default, only trace log final group list 2014-03-18 20:06:31 -06:00
Joseph Hall
da36721d13 Turn the etcd returner into an external job cache 2014-03-18 18:36:56 -06:00
Samuel M Smith
81cb0141e5 started fixing raet header format 2014-03-18 17:32:17 -06:00
Samuel M Smith
ab732c10e4 started raet header
changed udp buffer
2014-03-18 17:11:37 -06:00
Gareth J. Greenaway
29960eba4c changing the send_msg function to adhere to the salt coding style. 2014-03-18 15:15:30 -07:00
Samuel Smith
a5153ba0c8 Merge pull request #11334 from SmithSamuelM/sam_raet_27
Sam raet 27 Basic reliability on UDP message transactions
2014-03-18 15:57:37 -06:00
Samuel M Smith
b45543083a Merge remote-tracking branch 'upstream/develop' into sam_raet_27 2014-03-18 15:56:20 -06:00
Samuel M Smith
bc10afec2d Basic support for more reliable message transactions
Now waits for ack on each segment
Now send ack on recept of each segment
Redo timer resends last segment
Times out if too long
2014-03-18 15:54:53 -06:00
Thomas S Hatch
6f284aad59 whitespace 2014-03-18 15:51:09 -06:00
Thomas S Hatch
cfc86239bb Merge pull request #11331 from rallytime/mac_group
Integration tests for mac_group module
2014-03-18 15:38:12 -06:00
Thomas S Hatch
50d2239c96 Merge pull request #11329 from cachedout/event_listen_func
New flag for watching minion returns by function.
2014-03-18 15:37:42 -06:00
Thomas S Hatch
f4c0c0ab4d lint fixes 2014-03-18 15:37:08 -06:00
Thomas S Hatch
45afa90328 Merge pull request #11324 from cachedout/eauth_group
Eauth group support
2014-03-18 15:32:03 -06:00
Thomas S Hatch
aea13eaaad Merge pull request #11332 from techhat/etcd
Add initial support for etcd
2014-03-18 15:12:24 -06:00
Samuel M Smith
1f5dac6be6 refactored packeting to support more reliable segmented messages
add Tray TxTray TxTray classes to manage segmentation
2014-03-18 15:03:37 -06:00
Joseph Hall
585c2755fc Add initial support for etcd 2014-03-18 14:49:54 -06:00
rallytime
761a774424 Integration tests for mac_group module 2014-03-18 14:34:36 -06:00
Mike Place
2752e4b019 Duh. Check func. 2014-03-18 14:10:51 -06:00
Mike Place
d4738b6352 New flag for watching minion returns by function. 2014-03-18 13:49:47 -06:00
Thomas S Hatch
c25b37f916 Forward output data back in the return data for raet 2014-03-18 13:44:02 -06:00
Thomas S Hatch
fc18de04ae Merge pull request #11328 from rallytime/mac_group
Check if gid exists before adding group in mac_group module
2014-03-18 13:22:23 -06:00
rallytime
813920b092 Merge branch 'develop' of https://github.com/saltstack/salt into mac_group 2014-03-18 13:11:42 -06:00
rallytime
f2cff53756 Check if gid exists before adding group and associated tests 2014-03-18 13:02:20 -06:00
Joseph Hall
c8f255b3d8 Merge pull request #11325 from garethgreenaway/develop
Updates to nftables state and module.
2014-03-18 12:11:09 -06:00
Gareth J. Greenaway
4a586baac9 Removing some unused functions from nftables module and state. Updating the versionadded to be Helium instead of Hydrogen. Updating docstrings to replace iptables with nftables syntax. 2014-03-18 11:07:14 -07:00