Alexandre Letourneau
0f4fbe9306
Fixed pylint issues
2015-04-21 13:05:57 -04:00
Alexandre Letourneau
508f704511
Cleaned up pull request
2015-04-21 10:40:13 -04:00
Alexandre Letourneau
d8fe360565
pam_tally counter was not reset to 0 after a succesfull login
2015-04-21 10:22:33 -04:00
Justin Findlay
bf52ba77fd
Merge pull request #22829 from F30/gen_locale-return-value
...
Always return a boolean in gen_locale()
2015-04-20 21:58:43 -06:00
Thomas S Hatch
645480423c
Merge pull request #22860 from nmadhok/patch-runtime-error
...
Fixing issue that causes RuntimeError maximum recursion Fixes #22839
2015-04-20 16:09:25 -06:00
Nitin Madhok
1f703ef548
Rename key
2015-04-20 16:54:42 -04:00
Nicole Thomas
799875f39e
Merge pull request #22864 from rallytime/pylint
...
Python 3 compat fix for modules/splay.py
2015-04-20 14:16:40 -06:00
rallytime
2dd761c0ea
Python 3 compat fix for modules/splay.py
2015-04-20 13:43:46 -06:00
Nitin Madhok
5b6f2995eb
Makes changes as suggested by Thomas so the loader does not break
2015-04-20 14:55:05 -04:00
Colton Myers
371ed19f34
Merge pull request #22862 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-04-20 12:22:13 -06:00
Colton Myers
ef583295d5
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Nitin Madhok
1688d19c7d
Fixing issue that causes RuntimeError maximum recursion Fixes #22839
2015-04-20 13:17:02 -04:00
Thomas S Hatch
b90306f7d4
Merge pull request #22832 from F30/locale-docs
...
Improve docs for modules.localemod & states.locale
2015-04-20 10:29:34 -06:00
Thomas S Hatch
d5d1ddc8d6
Merge pull request #22705 from jayeshka/win_dns_client_unit_test
...
adding win_dns_client test case and used @patch for mocking.
2015-04-20 09:50:22 -06:00
Thomas S Hatch
9599795bf0
Merge pull request #22828 from cro/svcbeacon_features
...
Add onchangeonly and uncleanshutdown to service beacon
2015-04-20 09:40:41 -06:00
Thomas S Hatch
1339ee5339
Merge pull request #22830 from F30/remove-tox
...
Remove Tox config
2015-04-20 09:38:36 -06:00
Justin Findlay
3651d21ad4
Merge pull request #22743 from jayeshka/netscaler-unit-test
...
adding netscaler unit test case
2015-04-20 09:25:17 -06:00
Thomas S Hatch
0525f17c50
Merge pull request #22683 from matdrapeau/22682_deploy_key_machine_id
...
Making ssh-copy-id using the provided machine name and not ip
2015-04-20 09:23:44 -06:00
Thomas S Hatch
962755c1d1
Merge pull request #22562 from makinacorpus/g
...
Workaround for grains loading
2015-04-20 09:22:19 -06:00
Thomas S Hatch
3c24694a71
Merge pull request #22841 from felskrone/upstream_concache_worker
...
Connected - CacheWorker addition
2015-04-20 09:21:31 -06:00
Thomas S Hatch
d7413b9b6f
Merge pull request #22836 from jodv/fix_missing_module_error_msg
...
fix conditional logic for missing function messages
2015-04-20 09:19:47 -06:00
Thomas S Hatch
80526b74a7
Merge pull request #22835 from jodv/splay_mod
...
add splay module
2015-04-20 09:17:10 -06:00
Thomas S Hatch
e197e491d5
Merge pull request #22819 from msteed/issue-21615
...
cli: don't report syndics as unresponsive minions
2015-04-20 09:15:32 -06:00
Thomas S Hatch
5f6393d417
Merge pull request #22817 from garethgreenaway/beacon_management_module
...
Beacon management module
2015-04-20 09:14:32 -06:00
Thomas S Hatch
a7ff60491b
Merge pull request #22815 from plastikos/issue-22797
...
Fix failure with nested nodegroups:
2015-04-20 09:12:54 -06:00
vs
8f38512e9f
pylint fix
2015-04-20 09:23:55 +02:00
vs
8fa09bc9cc
doc fix
2015-04-20 08:27:43 +02:00
vs
9e5cbe21da
change loglevel to debug
2015-04-20 08:15:28 +02:00
vs
c2f5829b0e
enhance cache update to distinguish between CacheWorker and Mworker updates
2015-04-20 08:15:23 +02:00
vs
7e39d407f8
dont do elifs, both might match during a single iteration
2015-04-20 08:15:17 +02:00
vs
c66df2d03d
query the cache before updating it
2015-04-20 08:15:09 +02:00
vs
f0b43ef4fb
no need to call parent
2015-04-20 08:15:03 +02:00
vs
0cd0b2db56
start a CacheWorker in 30 second intervals to keep cached minions up to date
2015-04-20 08:14:56 +02:00
vs
e0ff8adccb
Mworker send 1-item-lists, CacheWorkers send larger lists and replace the cache
2015-04-20 08:14:50 +02:00
vs
e64c4d2969
remove deprecated/unneeded old code
2015-04-20 08:14:45 +02:00
vs
e675dc7a3f
add CacheWorker for ConnectedCache as multiprocessing.process
2015-04-20 08:14:34 +02:00
Joseph Hall
3b17858052
Merge pull request #22837 from nmadhok/vmware-cloud-driver
...
Making vmware cloud driver Python3 compatible and other additions
2015-04-19 15:57:43 -06:00
Nitin Madhok
cbe860dab2
Making vmware-cloud driver python3 compatible
2015-04-19 13:33:34 -04:00
Nitin Madhok
2c2705f7a9
Rename _set_network_adapter_mapping to _set_network_adapter_mapping_helper
2015-04-19 12:13:51 -04:00
Nitin Madhok
1b0f2481f7
Combining duplicate code for network adapter mapping in a single helper function
2015-04-19 12:08:00 -04:00
Joseph Hall
46c391bd87
Merge pull request #22812 from nmadhok/vmware-cloud-driver
...
Added functions rescan_all_hbas() & rescan_hba() in vmware salt cloud driver
2015-04-19 07:28:57 -06:00
Jeremy Rosenbaum
e876c5fab5
PEP 263 UTF-8 encoding
2015-04-18 23:33:04 -07:00
Jeremy Rosenbaum
15bb35e261
fix trailing whitespace
2015-04-18 23:30:33 -07:00
Jeremy Rosenbaum
b74b2dde60
pylint fixes
2015-04-18 22:42:13 -07:00
Jeremy Rosenbaum
1d246fb529
fix conditional logic for missing function messages
2015-04-18 22:34:17 -07:00
Jeremy Rosenbaum
656a8d1339
add splay module
2015-04-18 21:27:16 -07:00
C. R. Oldham
1f49663eb7
Make sure we are checking for the right dictionary entry
2015-04-18 22:02:54 -06:00
Felix Dreissig
169ea9e1f3
Document charmap for locale generation
...
Add the fact that the charmap must be specified when generating locales
on Debian or Gentoo to the docs for modules.localemod and states.locale.
Something similar had been part of @4be92ed, but has been removed again
in @8565d7e.
2015-04-18 23:14:01 +02:00
Felix Dreissig
3925299394
Add example for locale.present to the states.locale docs
2015-04-18 23:09:49 +02:00
Nitin Madhok
64e527c4dc
Adding ability to modify/create SCSI adapters #22364
2015-04-18 17:09:11 -04:00
