Joseph Hall
f328728625
Merge pull request #12996 from zeezooz/iptables_integer_values
...
Fix condition to support non-string values.
2014-05-23 09:12:06 -06:00
Joseph Hall
39906088c6
Merge pull request #12995 from JasonSwindle/patch-1
...
#12989 Fix for '3 arguments (4 given)' error.
2014-05-23 09:05:06 -06:00
Cott Lang
270d693d5b
Modified skip flag logic to skip instead of filter.
...
Defaulted skipPresent to false, since it causes legitimate patches to be missed.
Fixed output of install_updates.
Fixed misc. code problems.
2014-05-23 08:47:53 -06:00
Andrew Burdo
d02774d39b
Fix condition to support non-string values.
2014-05-23 17:47:04 +03:00
Jason Swindle
e773e1fb57
#12989 Fix for '3 arguments (4 given)' error.
2014-05-23 09:45:00 -05:00
Joseph Hall
16596d7d2f
Merge pull request #12991 from MTecknology/develop
...
Added more information about how salt-syndic works.
2014-05-23 08:31:51 -06:00
Erik Johnson
5e0d10f03c
Update event tests to use truncated hash
2014-05-23 08:57:01 -05:00
Michael Lustfield
290cc87163
Adjusted wording and point of view.
2014-05-23 08:29:01 -05:00
Erik Johnson
8bbb78f5bc
Truncate id hash to 10 chars
...
This helps avoid the sock path being longer than the max length allowed
by the kernel. See the following comment for more information:
https://github.com/saltstack/salt/issues/12172#issuecomment-43903643
2014-05-23 08:26:41 -05:00
Michael Lustfield
bb91f7b428
Added more information about how salt-syndic works.
2014-05-22 23:20:31 -05:00
Thomas S Hatch
690d4dea5c
Revert "Truncate id hash to 10 chars"
...
This reverts commit a39f3f6cbf
2014-05-22 20:14:33 -06:00
Joseph Hall
40843b35f1
Merge pull request #12970 from GeekyTex/develop
...
Added Ec2 Placement Group support
2014-05-22 17:41:36 -06:00
Joseph Hall
3f6026e6c4
Merge pull request #12987 from getlantern/develop
...
Fix crash when launching an EC2 instance.
2014-05-22 17:39:04 -06:00
Joseph Hall
5a42d52950
Merge pull request #12988 from gtmanfred/develop
...
cache node correctly
2014-05-22 17:37:04 -06:00
Daniel Wallace
e7a1c59928
cache node correctly
...
closes 12951
2014-05-22 18:33:57 -05:00
Pedro Algarvio
042b1699ed
Merge pull request #12984 from rallytime/pylint_fixes
...
Fix python 3 indexing exceptions
2014-05-23 00:10:52 +01:00
Pedro Algarvio
ae8f8e825d
Merge pull request #12985 from cachedout/12949
...
Pylint
2014-05-23 00:08:35 +01:00
Seth House
978e505b5f
Updated Google Analytics tracking code
2014-05-22 16:56:02 -06:00
Erik Johnson
2a596b5f1e
lint fixes
2014-05-22 17:51:38 -05:00
Spider Person
201008b35d
Fix crash when launching an EC2 instance.
2014-05-23 00:48:19 +02:00
Mike Place
bdc71d4f97
Don't stacktrace if we can't write a job cache.
...
Closes #12978
2014-05-22 16:45:16 -06:00
Mike Place
9ff2a6a768
Pylint
2014-05-22 16:38:28 -06:00
Erik Johnson
297e252b6a
Fix indentation of class
2014-05-22 17:33:50 -05:00
rallytime
2e044e55a8
Fix python 3 indexing exceptions
2014-05-22 16:10:02 -06:00
Colton Myers
aadbc7790f
Properly use try-finally for file handle management
2014-05-22 15:46:35 -06:00
GeekyTex
196f53a40a
added placement group support. Fixed line spacing
2014-05-22 21:27:38 +00:00
Michal Bicz
68e121453c
disable confusing [ERROR] printing on retcode!=0 where not relevant
2014-05-22 14:16:32 -07:00
Joseph Hall
5f494c3c2a
Merge pull request #12979 from whiteinge/doc-minionfs-settings
...
Added links to more minionfs settings
2014-05-22 14:28:26 -06:00
Seth House
0cd1ba8ad1
Added links to more minionfs settings
2014-05-22 14:23:35 -06:00
Joseph Hall
aaeef20ab0
Merge pull request #12977 from UtahDave/develop
...
Add sqlite3 to the freezer includes
2014-05-22 14:14:05 -06:00
David Boucha
131aa168c6
Add sqlite3 to the freezer includes
2014-05-22 14:12:28 -06:00
Diego Woitasen
d6e2338844
Document the options that should not be used in the tar_options
...
parameter. Let the command tar to fail if the user dosn't use the right
options like --file, -a, -x, etc.
It doesn't worth the effort to put a logic to detect forbidden options
in the module.
The current code of removing 'f' breaks long options that have 'f', like
--transform.
2014-05-22 16:15:15 -03:00
Diego Woitasen
89dc67d6fc
Document the options not allowed in the
2014-05-22 16:13:48 -03:00
David Boucha
5785e1e753
Merge pull request #12974 from cachedout/ssh_windows
...
Fix esky breaking
2014-05-22 13:10:33 -06:00
Erik Johnson
028769606e
Fix traceback due to unavailable module
...
The class defined in this state references a module that is not
installed. This commit moves the class definition with the try/except
where the deps it requires are loaded.
2014-05-22 13:55:22 -05:00
Joseph Hall
4af6996443
Merge pull request #12972 from cachedout/network_lo
...
Wider detection of loopback interfaces
2014-05-22 12:22:31 -06:00
Mike Place
c35cb15b84
Don't open files on windows. This breaks all Salt commands.
2014-05-22 12:20:07 -06:00
Joseph Hall
c64a977f1c
Merge pull request #12973 from whiteinge/doc-windows-install
...
Minor rST indentatation fixes to the Windows install docs
2014-05-22 12:04:27 -06:00
Seth House
a4abb798db
Minor rST indentatation fixes to the Windows install docs
2014-05-22 12:00:54 -06:00
Mike Place
acded6d178
Wider detection of loopback interfaces
...
Refs #12811
Conflicts:
salt/utils/network.py
Wrap in list
2014-05-22 11:28:01 -06:00
Joseph Hall
eb4bb2943b
Merge pull request #12971 from terminalmage/issue12172
...
Add test for #12172
2014-05-22 11:04:25 -06:00
Erik Johnson
0d35a56772
Ensure this test is run as root
2014-05-22 12:02:44 -05:00
Erik Johnson
4de5050ded
Add test for sock path length
2014-05-22 11:59:26 -05:00
Colton Myers
2cf746550b
Merge pull request #12944 from samhitov/gem-installed-version
...
12839: Install specified version of gem if another version is already installed
2014-05-22 10:54:42 -06:00
Pedro Algarvio
a9879a8f52
Merge pull request #12969 from terminalmage/issue12172
...
Truncate id hash to 10 chars
2014-05-22 17:38:36 +01:00
Erik Johnson
a39f3f6cbf
Truncate id hash to 10 chars
...
This helps avoid the sock path being longer than the max length allowed
by the kernel. See the following comment for more information:
https://github.com/saltstack/salt/issues/12172#issuecomment-43903643
2014-05-22 10:45:42 -05:00
GeekyTex
e5d3710285
commiting change to ec2.py, added placement group support
2014-05-22 15:33:54 +00:00
Joseph Hall
2a23d44655
Merge pull request #12961 from macaronyde/develop
...
#12913 - Missing broadcast option for states/network -> modules/debian_ip
2014-05-22 07:50:53 -06:00
Joseph Hall
d73e8f3a3f
Merge pull request #12964 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #59
2014-05-22 07:40:06 -06:00
Pedro Algarvio
a713b64eb1
Update 'doc/.tx/config' - Build #59
...
http://cookingwithsalt.org/job/salt/job/transifex/59/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-05-22 14:05:01 +01:00
