Evan Borgstrom
72cb2ab35b
Add pyobjects tests
2014-02-17 19:54:56 -05:00
Evan Borgstrom
a3795a7be2
Porting code from "nacl" project into Salt as "pyobjects"
...
Todo:
* Adapt tests into Salt test framework
See:
* https://github.com/borgstrom/nacl
* http://borgstrom.ca/2014/02/15/building-a-pythonic-interface-to-saltstack-states.html
* https://groups.google.com/forum/#!topic/salt-users/5frdabVwAdE
2014-02-17 19:12:51 -05:00
David Boucha
c9ebb2dcf9
Merge pull request #10476 from s0undt3ch/hotfix/jinja-sequence-filter
...
Jinja's sequence filter does not need to be an extension.
2014-02-15 11:22:28 -07:00
Pedro Algarvio
7a42bf24fc
Jinja's sequence filter does not need to be an extension.
2014-02-15 17:26:35 +00:00
Joseph Hall
da6f73fbb2
Merge pull request #10474 from s0undt3ch/hotfix/lint
...
PyLint quietly ignore it!
2014-02-15 09:37:13 -07:00
Pedro Algarvio
197966ca58
Tell PyLint not to complain about ignored files
2014-02-15 16:30:42 +00:00
Pedro Algarvio
a009d6b80a
Make Pylint ignore file
2014-02-15 16:30:23 +00:00
Joseph Hall
50f3df8114
Merge pull request #10460 from s0undt3ch/hotfix/make-master-local-minion
...
Allow the new master's minion to answer to local master
2014-02-15 07:22:26 -07:00
Pedro Algarvio
4f6a3e36af
Remove first person reference
2014-02-15 14:17:21 +00:00
Pedro Algarvio
3436863f41
Add exmaple of any minion responding to local master
2014-02-15 14:17:21 +00:00
Pedro Algarvio
c27bb8b4a0
Remove extra space
2014-02-15 14:17:21 +00:00
Pedro Algarvio
2db72c519b
Allow any of the minions to say they're local
2014-02-15 14:17:21 +00:00
Pedro Algarvio
5d77e5244d
Document make master's minion answer to local master.
2014-02-15 14:17:21 +00:00
Pedro Algarvio
42ca06c90a
Allow the new master's minion to answer to local master
2014-02-15 14:17:21 +00:00
Joseph Hall
c8729d8870
Merge pull request #10472 from obestwalter/develop
...
fixed typos: recieved -> received
2014-02-15 06:30:34 -07:00
Oliver Bestwalter
72d4f55270
fixed typos: recieved -> received
2014-02-15 12:50:20 +01:00
Thomas S Hatch
14e79ea857
Merge pull request #10379 from johnnoone/jinja-filter
...
fix jinja SequenceExtension
2014-02-14 22:39:30 -07:00
Joseph Hall
20b9511a76
Merge pull request #10464 from hulu/remove_mentions_of_0_18_0
...
Replace mentions of 0.18.0 with 2014.1.0
2014-02-14 19:36:38 -07:00
David Lindquist
9c91539de7
Replace mentions of 0.18.0 with 2014.1.0
2014-02-14 17:01:57 -08:00
Pedro Algarvio
56af316318
Merge pull request #10462 from rallytime/lint_fixes
...
Missed one lint fix - fixed now
2014-02-15 00:42:58 +00:00
rallytime
1a5838826c
Missed one lint fix
2014-02-14 17:17:39 -07:00
David Boucha
a09e97e51d
Merge pull request #10461 from UtahDave/develop
...
add newer 0.17.5 Windows installer links
2014-02-14 16:53:30 -07:00
David Boucha
4ec8959149
add newer 0.17.5 Windows installer links
2014-02-14 16:51:05 -07:00
Thomas S Hatch
da477a920b
Merge pull request #10457 from basepi/configfix10433
...
Clarify the actions salt will take when run as non-root, Ref #10433
2014-02-14 16:35:15 -07:00
Thomas S Hatch
1a1abd978d
Merge pull request #10458 from basepi/tokenperms10422
...
Ensure ~/.salt_token is created with 0600 permissions, Fix #10422
2014-02-14 16:34:37 -07:00
Thomas S Hatch
67205e2106
whitespace
2014-02-14 16:34:03 -07:00
Colton Myers
f0f96acab1
Ensure ~/.salt_token is created with 0600 permissions, Fix #10422
2014-02-14 15:10:34 -07:00
Thomas S Hatch
2b745e2b9b
Merge pull request #10442 from SaveTheRbtz/security
...
security: avoid race between file creation and chmod(2)
2014-02-14 15:02:05 -07:00
Alexey Ivanov
cf0f1c981c
security: avoid race between file creation and chmod(2)
...
Also:
- salt.utils.check_ipc_path_max_len() on master pull socket
- change mode from 0700 to 0600 for socket files
- added debug logging
TODO: move file creation with specified mode to separate utils function.
2014-02-14 13:57:33 -08:00
Colton Myers
cd9480c261
Clarify the actions salt will take when run as non-root
...
Ref #10433
Also fix a dangling preposition
2014-02-14 14:52:19 -07:00
Thomas S Hatch
ef26e5efc8
Merge pull request #10450 from rallytime/dnsutil_test
...
One more dnsutil test
2014-02-14 13:54:24 -07:00
Thomas S Hatch
8cb6a549d1
Merge pull request #10453 from rallytime/lint_fixes
...
lint fixes
2014-02-14 13:54:10 -07:00
rallytime
647122cc55
lint fixes
2014-02-14 13:44:36 -07:00
Thomas S Hatch
db536cc73c
Merge pull request #10452 from thematthopkins/windows_postgres_import_fix
...
re-adding fix for import error for windows postgres
2014-02-14 13:16:22 -07:00
Matthew Hopkins
c789f2f65e
re-adding fix for import error for windows postgres
2014-02-14 15:08:45 -05:00
rallytime
e8fbd5cd01
import fix
2014-02-14 13:06:58 -07:00
Thomas S Hatch
7cc71ff1d5
Merge pull request #10426 from plastikos/issue-10425
...
Include msgpack in thin.tgz
2014-02-14 13:05:56 -07:00
Thomas S Hatch
0845c4d9da
Merge pull request #10417 from plastikos/issue-10415
...
Preserve cmd.run variants issued over SSH.
2014-02-14 13:01:12 -07:00
Thomas S Hatch
38c41f0f3d
Merge pull request #10410 from jacksontj/cachereturns
...
Fix race condition in get_cache_returns
2014-02-14 13:00:35 -07:00
rallytime
9c4dd8232a
Merge branch 'develop' of https://github.com/saltstack/salt into dnsutil_test
2014-02-14 12:54:00 -07:00
Thomas S Hatch
e6b0a27281
Merge pull request #10403 from terminalmage/10367
...
dig.SPF fixes
2014-02-14 12:52:00 -07:00
Thomas S Hatch
0c75b80811
Merge pull request #10394 from Stelminator/minion_dry2
...
DRY in minion.py
2014-02-14 12:47:31 -07:00
rallytime
d03b816c5b
Merge branch 'develop' of https://github.com/saltstack/salt into dnsutil_test
2014-02-14 12:45:22 -07:00
rallytime
20cb9de36f
One more dnsutil test
2014-02-14 12:42:59 -07:00
Thomas S Hatch
fd5500724b
Merge pull request #10229 from kaithar/feature/enhanced-mysql-pillar
...
Proposal: enhanced mysql pillar
2014-02-14 12:40:06 -07:00
Thomas S Hatch
a37b9b5708
Merge pull request #10205 from mbirtwell/syndic_main_loop_develop-2
...
Syndic main loop develop 2
2014-02-14 12:37:31 -07:00
David Boucha
8b9165e1aa
Merge pull request #10440 from UtahDave/develop
...
release 0.17.5 Windows installers
2014-02-14 01:46:41 -07:00
David Boucha
b44e681c5c
release 0.17.5 Windows installers
2014-02-14 01:45:48 -07:00
Erik Johnson
a263a088e5
fix pylint (add blank line)
2014-02-13 13:34:53 -06:00
Erik Johnson
014381f470
Fix bug in dig.SPF when processing redirects
...
This fixes a bug where dig.SPF would infinitely recurse on redirects
because, instead of looking up the redirect domain, it was looking up
the domain initially passed to the function.
2014-02-13 12:39:29 -06:00
