Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Justin Findlay
a5df4adfba
Merge pull request #22949 from s0undt3ch/develop
...
Disable some PyLint false positives
2015-04-22 11:01:34 -06:00
Thomas S Hatch
2520e816bc
Merge pull request #22679 from jfindlay/merge_22219
...
merge #22219
2015-04-22 10:47:45 -06:00
Mike Place
a0cfd8573f
Merge pull request #22947 from garethgreenaway/22571_2015_2_schedule_pillar_refresh_seconds_exceptions
...
Fixes to scheduler
2015-04-22 10:26:10 -06:00
Thomas S Hatch
0287c439bb
Merge pull request #22912 from thatch45/loader_fix
...
late init the lazy loader
2015-04-22 09:50:48 -06:00
Thomas S Hatch
3867950e13
Merge pull request #22659 from jacksontj/transport
...
Transport: misc cleanup
2015-04-22 09:48:00 -06:00
Pedro Algarvio
d3284ba463
Disable some PyLint false positives
2015-04-22 16:46:17 +01:00
Mike Place
b03a614829
Merge pull request #22913 from skizunov/develop
...
Fix Windows salt-master support for ZeroMQ
2015-04-22 09:40:36 -06:00
Mike Place
a2d2a5b3cb
Merge pull request #22931 from jacksontj/2015.2
...
Cleanup jinja attribute access for loader
2015-04-22 09:35:29 -06:00
Mike Place
e3fb101f63
Merge pull request #22928 from DSRCompany/flush_returners_queue
...
Issue #22814 : Flush returners queue before salt master shutdown
2015-04-22 09:32:19 -06:00
Gareth J. Greenaway
595bc284b7
Fixing a reported issue when using a scheduled job from pillar with splay. _seconds element that acted as a backup of the actual seconds was being removed when pillar was refreshed│··································
...
and causing exceptions. This fix moves some splay related code out of the if else condition so it's checked whether the job is in the job queue or not.
2015-04-22 08:17:04 -07:00
Justin Findlay
2589e15e5c
Merge pull request #22938 from jayeshka/powerpath-unit-test
...
adding powerpath unit test case
2015-04-22 08:51:39 -06:00
Justin Findlay
a70fa267b1
Merge pull request #22936 from jayeshka/boto_dynamodb-states-unit-test
...
adding states/boto_dynamodb unit test case
2015-04-22 08:49:52 -06:00
Justin Findlay
ce1a880025
Merge pull request #22935 from jayeshka/boto_cloudwatch_alarm-states-unit-test
...
adding states/boto_cloudwatch_alarm unit test case
2015-04-22 08:48:19 -06:00
Justin Findlay
3e31385318
Merge pull request #22934 from jayeshka/boto_asg-states-unit-test
...
adding states/boto_asg unit test case
2015-04-22 08:47:41 -06:00
Jayesh Kariya
5a5c7ef415
adding powerpath unit test case
2015-04-22 17:38:44 +05:30
Jayesh Kariya
650435ec44
adding states/boto_dynamodb unit test case
2015-04-22 16:17:29 +05:30
Jayesh Kariya
4e5a101647
adding states/boto_cloudwatch_alarm unit test case
2015-04-22 16:15:54 +05:30
Jayesh Kariya
f78374e34a
adding states/boto_asg unit test case
2015-04-22 16:13:14 +05:30
Thomas Jackson
98af7c3f95
Cleanup jinja attribute access for loader
...
Refactor of #22723
2015-04-21 22:39:17 -07:00
Justin Findlay
775bee936a
Merge pull request #22909 from virtua-network/fix_pkgin_parser
...
Fix compatibility with pkgin > 0.7
2015-04-21 22:48:43 -06:00
Justin Findlay
ca27f0d0c0
fix pip module saltenv requirements handling
...
Fix a stack trace that happens if the requirements.txt file cannot be
found in the given saltenv.
2015-04-21 22:26:52 -06:00
Justin Findlay
a0e253df95
Merge pull request #22927 from jfindlay/merge_22922
...
[develop] lint fixes
2015-04-21 22:19:36 -06:00
Gideon Redelinghuys
c0e2f2d104
Have fileclient check if file exists on server before modifying file system on minion
2015-04-21 22:15:28 -06:00
Pedro Algarvio
f7e6f716e3
Make PEP-8 checker happier
2015-04-21 20:35:14 -06:00
Pedro Algarvio
b831d14bfc
Properly indent comments
2015-04-21 20:35:14 -06:00
Pedro Algarvio
5f7ab3dc36
Another PEP-8 preciosity disabled
2015-04-21 20:35:14 -06:00
Pedro Algarvio
4617f03dda
Make PEP-8 happier
2015-04-21 20:35:14 -06:00
Pedro Algarvio
23ad161531
Additionally ignore import-error
2015-04-21 20:35:14 -06:00
Pedro Algarvio
492c6513bb
Fix W1504(unidiomatic-typecheck)
...
Using type() instead of isinstance() for a typecheck.
2015-04-21 20:35:14 -06:00
Dmitry Kuzmenko
8b6c7ee08b
Flush returners queue before salt master shutdown
2015-04-22 05:33:08 +03:00
Justin Findlay
d34e7c0585
Merge pull request #22926 from rallytime/pylint-dev
...
Python 3 compat for salt/auth/pam.py
2015-04-21 20:30:45 -06:00
Justin Findlay
4db13ee454
Merge pull request #22924 from rallytime/bp-22829
...
Backport #22829 to 2015.2
2015-04-21 20:29:56 -06:00
Justin Findlay
049276af44
Merge pull request #22921 from s0undt3ch/hotfix/lint-2015.2
...
Another PEP-8 preciosity disabled
2015-04-21 20:28:42 -06:00
Justin Findlay
53001566e0
Merge pull request #22882 from freimer/issue_22880
...
Fix for issue #22880 , this should be **kwarg, not kwarg=None.
2015-04-21 20:28:03 -06:00
rallytime
f61abb0c37
Python 3 compat for salt/auth/pam.py
2015-04-21 19:24:55 -06:00
Felix Dreissig
468d392074
Adjust tests to the new return value of modules.localemod.gen_locale()
2015-04-21 19:11:33 -06:00
Felix Dreissig
16136f49ec
Always return a boolean in modules.localemod.gen_locale()
...
This makes the behavior consistent with set_locale() and the error case.
states.locale.present() already expects a boolean return value;
therefore, this will probably resolve saltstack/salt#21140 .
2015-04-21 19:10:43 -06:00
Nicole Thomas
f870f75b46
Merge pull request #22920 from cachedout/dns_check_err
...
Better err handling for unresoveable master addr
2015-04-21 19:00:00 -06:00
Nicole Thomas
522d1d8468
Merge pull request #22917 from twangboy/upd_icon
...
Updated icon file for windows
2015-04-21 18:56:47 -06:00
Nicole Thomas
2793ad667b
Merge pull request #22911 from rallytime/test_fixes
...
Fix some Python 2.6-related test failures on 2015.2
2015-04-21 18:44:37 -06:00
Pedro Algarvio
430c5cfdf7
Another PEP-8 preciosity disabled
2015-04-22 00:46:20 +01:00
Mike Place
bac22b1261
Better err handling for unresoveable master addr
2015-04-21 17:14:51 -06:00
salt_build
7cbabd0cf9
Updated icon file for windows
2015-04-21 22:33:59 +00:00
Colton Myers
d23ee2f80a
Merge pull request #22915 from basepi/boto_rds.version_added
...
Update versionadded for boto_rds modules
2015-04-21 16:06:14 -06:00
Colton Myers
073f79adb1
Update versionadded for boto_rds modules
2015-04-21 16:06:05 -06:00
Sergey Kizunov
af65bba00b
Fix Windows salt-master support for ZeroMQ
...
The following changes were required:
salt/master.py:
- 'SMaster.aes' no longer exists. 'SMaster.secrets' now does. The
pickling code is adjusted accordingly.
- MWorker __init__ no longer uses 'self.serial'. 'self.req_channels'
was added. The pickling code is adjusted accordingly.
- On Windows, Service account home directories may not initially exist.
If this is the case, make sure the directory exists before continuing.
salt/minion.py:
- The 'Minion' __init__ function will not set certain fields that are
required in '_thread_return'. On Windows, '_thread_return' will
instantiate a new object that is derived from 'MinionBase', and this
object may be a 'Minion' object. Due to this, make sure that the
required fields are set before they are used.
salt/transport/zeromq.py:
- ZeroMQ for Windows doesn't support 'IPC' mode. Due to this, allow
'ipc_mode' to be set to 'tcp' and react accordingly.
General:
On Windows os.rename() will fail if the destination file exists. Due to
this, use 'salt.utils.atomicfile.atomic_rename' where appropriate.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-04-21 16:01:01 -05:00
Thomas S Hatch
11ea3f99fc
late init the lazy loader
...
due to slight changes in python3 how inherited classes seem to be
loaded we need to late call the subclass __init__ method
2015-04-21 14:29:32 -06:00
rallytime
cac386247c
Skip the network state unit tests if sustem is on Python 2.6
...
These tests need to be refactored to be able to run on Python 2.6
2015-04-21 14:13:58 -06:00
Fred Reimer
7958e19e9a
Merge remote-tracking branch 'upstream/2015.2' into issue_22880
2015-04-21 15:03:41 -04:00
