Commit Graph

47030 Commits

Author SHA1 Message Date
Omer Katz
03793ab1eb Added the ability to delete a VPC by name and tags. Fixes #20621. 2015-02-12 11:43:19 +02:00
cxfcxf
ef589559ee add ranged interface support for bond and fix typo on rh6_eth.jinja 2015-02-11 22:21:17 -08:00
Mike Place
8101057272 Remove unused function in doc runner 2015-02-11 22:23:06 -07:00
Mike Place
d16fd18a9c Cleaning empty pass statements 2015-02-11 22:21:20 -07:00
Thomas S Hatch
dc07c023cf Merge branch 'cxfcxf-develop' into develop 2015-02-11 18:13:58 -07:00
Thomas S Hatch
bb02e54ccc lint 2015-02-11 18:13:35 -07:00
Thomas S Hatch
daca04fe85 Merge branch 'develop' of https://github.com/cxfcxf/salt into cxfcxf-develop 2015-02-11 18:10:44 -07:00
Thomas S Hatch
22efff8eb8 Merge pull request #20609 from l2ol33rt/logging_pcre_roster_flat
Consistent logging for pcre match in flat roster
2015-02-11 18:04:41 -07:00
Thomas S Hatch
51a8fc1c6b Merge pull request #20607 from cachedout/masterless_raet
Support masterless mode for RAET
2015-02-11 18:04:08 -07:00
jfindlay
0810f1f176 Merge pull request #20611 from rallytime/fix_azure_failure
Don't use salt.utils.cloud.bootstrap to set defaults
2015-02-11 17:19:50 -07:00
cxfcxf
fad3fb0859 fix Exception and giving status to range interface file 2015-02-11 16:14:58 -08:00
jfindlay
acb3401c8e Merge pull request #20608 from cachedout/msgpack_empty
Avoid trying to deserialize empty files
2015-02-11 17:04:10 -07:00
Mike Place
389e02b6d6 Avoid trying to deserialize empty files
This fixes errors encountered by the minion where an attempt to read an empty file from the cache will produce msgpack exceptions in the log.
2015-02-11 16:35:14 -07:00
jfindlay
60202585b7 Merge pull request #20606 from rallytime/pylinting
Python 3 compat for archive.py
2015-02-11 16:11:20 -07:00
Mike Place
78bb2ce506 Support masterless mode for RAET
Also refactored caller to better support additional future transports.
2015-02-11 16:10:25 -07:00
rallytime
639b1a81f7 Don't use salt.utils.cloud.bootstrap to set defaults
Calling bootstrap here is unnecessary. The azure driver is bootstrapping
the minion before we even make it to this point in the code.

Fixes #20362
2015-02-11 16:06:09 -07:00
Robert James Hernandez
7db9554094 Consistent logging for pcre match 2015-02-11 14:59:10 -08:00
Thomas S Hatch
b0ff607669 Merge pull request #20577 from cachedout/ioflo_dummy
RAET performance testing
2015-02-11 15:51:19 -07:00
Tarjei Husøy
9f6dfb5a04 Remove lots of string concatenation in iptables module 2015-02-11 23:25:45 +01:00
cxfcxf
26eda7cdaf add range interface support for redhat system 2015-02-11 14:24:25 -08:00
Tarjei Husøy
943be9f0b3 Remove a lot of duplication in iptables module 2015-02-11 23:24:07 +01:00
Tarjei Husøy
ccfeeb7aaf Don't print to error log if iptables -C 'fails' 1 2015-02-11 23:24:07 +01:00
Tarjei Husøy
9afc8fca8a Add support for iptables --log-* arguments 2015-02-11 23:24:06 +01:00
Tarjei Husøy
aeb91b000c Refactor after_jump handling in iptaples module 2015-02-11 23:23:20 +01:00
rallytime
ec809331e7 Python 3 compat for archive.py 2015-02-11 15:15:59 -07:00
jfindlay
a1043ab87a Merge pull request #20605 from jfindlay/tar
fix tar check
2015-02-11 15:04:27 -07:00
Justin Findlay
8b68244eaa chmod -x tests/runtests.py 2015-02-11 15:03:36 -07:00
Mike Place
517a85f6db More lint 2015-02-11 13:31:37 -07:00
Mike Place
e316b183e6 Simplify to just loop. No need for calibration since it doesn't max out. 2015-02-11 13:30:09 -07:00
Mike Place
e8472ed9cc Pylint 2015-02-11 13:30:09 -07:00
Mike Place
2befd356c8 Iterate over workers directly 2015-02-11 13:30:09 -07:00
Mike Place
716fa253cb Remove servicequeue because ioflo does this
Add templating method, just the basics
2015-02-11 13:30:09 -07:00
Mike Place
463f95ccc0 Rough, but it works 2015-02-11 13:30:09 -07:00
Mike Place
5a730b13b9 Better ioflo routing 2015-02-11 13:30:09 -07:00
Mike Place
81221eac53 ioflow routing to dummy behaviour 2015-02-11 13:30:09 -07:00
Mike Place
0c3d97c8ad Merge pull request #20598 from thatch45/cachedout-unecessary_nest
Merge #20572 with fixes
2015-02-11 13:12:32 -07:00
cxfcxf
2d28640c17 add ability to turn off arpcheck 2015-02-11 12:00:25 -08:00
jfindlay
009dc57a5e Merge pull request #20599 from whiteinge/doc-scheduler-job_return
Fix job_return -> return_job example typo
2015-02-11 12:58:28 -07:00
Alexander Schwartz
7c6b8f1221 clean up lint messages 2015-02-11 19:57:14 +00:00
Alexander Schwartz
bc101bc582 simplified code after review 2015-02-11 19:56:43 +00:00
Colton Myers
fc5238400b Merge pull request #20600 from rallytime/rc_candidate_docs
Add release candidate notification to docs sidebar
2015-02-11 12:33:42 -07:00
rallytime
3c2dd7d801 Change the releasecnadidates doc to reflect 2015.2.0rc1 2015-02-11 12:30:16 -07:00
rallytime
a42a5fb6d5 Add release candidate notification to docs sidebar
v2015.2.0rc1
2015-02-11 12:17:29 -07:00
jfindlay
a572be2ca3 Merge pull request #20594 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-02-11 11:40:15 -07:00
Thomas S Hatch
776e64c2aa Lint 2015-02-11 11:24:08 -07:00
Thomas S Hatch
821d52a5f6 Merge branch 'unecessary_nest' of https://github.com/cachedout/salt into cachedout-unecessary_nest 2015-02-11 11:23:43 -07:00
Thomas S Hatch
b63cba0633 Merge pull request #20543 from dmyerscough/kerberos
Initial Kerberos Management
2015-02-11 11:22:14 -07:00
Colton Myers
b8efc6e307 Merge pull request #4 from jfindlay/merge_dev
fix iptables unit tests for merge forward
2015-02-11 11:01:21 -07:00
Justin Findlay
657b79912e fix iptables unit tests for merge forward 2015-02-11 10:52:07 -07:00
Colton Myers
01a4dc600b Fix lint for gitfs.py 2015-02-11 10:22:43 -07:00