Vitalii Nazg
8f9af6802b
Lint fixes: unused import, tabs
2014-12-01 22:08:23 +02:00
rallytime
9fe67a34c2
Make ZMQ 4 installation docs for ubuntu more clear
...
References #18476
2014-12-01 11:48:17 -07:00
Justin Findlay
4f8f957ae9
fix typos in states.user.present #18590
...
Fixes #18590 .
2014-12-01 11:01:58 -07:00
Thomas S Hatch
bf2950453d
Merge pull request #18577 from garethgreenaway/18534_2014_7_schedule_cpu_spike
...
Fixes to scheduler in 2014.7
2014-12-01 10:26:18 -07:00
Thomas S Hatch
804fbf966c
Merge pull request #18568 from terminalmage/issue18468
...
Fix yum pkg holding when doing version pinning with "pkgs" arg
2014-12-01 10:25:05 -07:00
Thomas S Hatch
e9733ec031
Merge pull request #18557 from eliasp/2014.7-pillar.pillar_ldap-no-results-logging
...
Move the log message in case no results were returned into the right block
2014-12-01 10:23:04 -07:00
Thomas S Hatch
e7f3be396b
Merge pull request #18556 from eliasp/2014.7-pillar.pillar_ldap-anonymous_bind
...
Prevent 'DSID-0C0906E8' error when binding to ActiveDirectory.
2014-12-01 10:22:15 -07:00
Thomas S Hatch
e2a0c0c754
Merge pull request #18543 from whiteinge/raet-compat-event-listen
...
Switch to RAET-compatible event listener
2014-12-01 10:16:46 -07:00
Thomas S Hatch
297693242b
Merge pull request #18526 from techhipster/saltmod-cmd-all-output
...
Saltmod cmd all output
2014-12-01 10:07:12 -07:00
Thomas S Hatch
36a4bf2d76
Merge pull request #18498 from jfindlay/quote_virtualenv
...
quote strs in virtualenv mod
2014-12-01 10:05:13 -07:00
rallytime
a26cd377ff
More cmdmod unittests
2014-12-01 08:57:11 -07:00
rallytime
c3d90c9f4f
If umask=0 is provided, enter the umask if statement
...
Previously the 'Zero umask is not allowed' statement was not getting hit
Also updated the appropriate umask tests
2014-12-01 08:57:10 -07:00
rallytime
98b06be08a
Added some more cmdmod unittests
2014-12-01 08:57:10 -07:00
rallytime
e7cdd75090
Add another cmdmod.py unittest
2014-12-01 08:57:10 -07:00
Chris Reeves
50b36550ad
If pulling a specific image tag check images locally with that tag
...
otherwise changes will be recorded even though there may not be any
2014-12-01 15:50:39 +00:00
Pedro Algarvio
641c119580
Merge pull request #18586 from s0undt3ch/2014.7
...
2014.7 Lint disable rules
2014-12-01 03:25:54 +00:00
Pedro Algarvio
e09750e97d
Ignore the locally enabled/disabled pylint checks
2014-12-01 03:24:41 +00:00
Pedro Algarvio
be18e8b244
Disable some Pylint errors
2014-12-01 03:24:41 +00:00
Pedro Algarvio
bdf3a3e91c
Disable some Pylint errors
2014-12-01 03:24:37 +00:00
Pedro Algarvio
fd9377fefe
Disable some Pylint errors
2014-12-01 03:23:52 +00:00
Pedro Algarvio
a985f0ac4e
Disable some Pylint errors
2014-12-01 03:23:52 +00:00
Pedro Algarvio
4dcb20eb62
Disable some Pylint errors
2014-12-01 03:23:51 +00:00
Pedro Algarvio
38b95953ef
Disable some Pylint errors
2014-12-01 03:23:46 +00:00
Pedro Algarvio
d7a4fdede2
Disable some Pylint errors
2014-12-01 03:20:00 +00:00
Joseph Hall
1e989d0252
Merge pull request #18524 from garethgreenaway/missing_scheduler_cron_docs
...
scheduler docs
2014-11-29 20:38:08 -07:00
Mike Place
9798f892ad
Merge pull request #18575 from eliasp/2014.7_doc_aggregate_typo
...
Fix typo (agregate → aggregate).
2014-11-29 14:33:20 -07:00
Gareth J. Greenaway
f5de037d96
Fixing a bug in the scheduler that caused a runaway job and CPU spikes when using the 'when' paramter. Also some cleanup of redundant calls to time.time and the comparison used to see when a job should run.
2014-11-29 10:59:24 -08:00
Elias Probst
6a7662c498
Fix typo (agregate → aggregate).
2014-11-29 15:58:07 +01:00
Erik Johnson
b11542dab9
Update 2014.7.1 release notes
2014-11-28 16:55:49 -06:00
Vitalii Nazg
8ff9e7f7e9
salt.utils.network._interfaces_ifconfig: SunOS fix
...
In SunOS 11.1 with IPv6 enabled interfaces occur twice in 'ifconfig -a'
output with the same name: for ipv4 and then for ipv6 addr family. Thus,
ipv6 data overwrites data collected from ipv4 interfaces.
Every instance has it's own 'UP' status and we assume that ipv4
status determines global interface status.
Thus commit tries to merge data from conflicting instances.
Also, regexp was tuned for SunOS's ifconfig.
2014-11-28 19:02:45 +02:00
Erik Johnson
55dac6f73c
Fix yum pkg holding when doing version pinning with "pkgs" arg
...
Resolves #18468
2014-11-28 10:57:41 -06:00
Pedro Algarvio
cc4afe8a52
Merge pull request #18528 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #213
2014-11-28 10:41:20 +00:00
Elias Probst
6a5b2f6dee
Move the log message in case no results were returned into the right block
2014-11-27 23:12:09 +01:00
Elias Probst
68de0b3703
Prevent 'DSID-0C0906E8' error when binding to ActiveDirectory.
2014-11-27 22:27:36 +01:00
Seth House
c92cdedc8d
Switch to RAET-compatible event listener
2014-11-27 00:25:10 -07:00
Nicole Thomas
968ec62b20
Merge pull request #18525 from s0undt3ch/2014.7
...
Switch `open()` for `salt.utils.fopen()`
2014-11-26 19:40:38 -07:00
Thomas S Hatch
bb53bc3901
Merge pull request #18532 from cro/nssm32bit_20147
...
Upgrade nssm but switch back to 32 bit
2014-11-26 18:45:24 -07:00
Thomas S Hatch
c085a23761
Merge pull request #18539 from wt/fix_s3fs_2014.7_exception
...
Handle errors while unpickling.
2014-11-26 18:41:25 -07:00
Pedro Algarvio
33ee04d835
Switch open()
for salt.utils.fopen()
2014-11-26 23:44:16 +00:00
Pedro Algarvio
3c31fce736
Switch open()
for salt.utils.fopen()
2014-11-26 23:40:43 +00:00
Pedro Algarvio
f28d134d36
Switch open()
for salt.utils.fopen()
2014-11-26 23:39:47 +00:00
Pedro Algarvio
78bc5107ee
Switch open()
for salt.utils.fopen()
2014-11-26 23:38:34 +00:00
Pedro Algarvio
62ec46d6dd
Switch open()
for salt.utils.fopen()
2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911
Switch open()
for salt.utils.fopen()
2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720
Switch open()
for salt.utils.fopen()
2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f
Switch open()
for salt.utils.fopen()
2014-11-26 23:30:18 +00:00
Warren Turkal
18a5851d9d
Handle errors while unpickling.
...
The metadata cache for s3 can get corrupted. If unpickling raises such
an error we should just refetch the data from s3.
2014-11-26 15:16:36 -08:00
Pedro Algarvio
8735242906
We need to call read()
!
2014-11-26 23:13:19 +00:00
Pedro Algarvio
b8b4158377
Remove unused import
2014-11-26 21:52:30 +00:00
Pedro Algarvio
aaf0f4aba0
Fix imports
2014-11-26 21:08:13 +00:00