Jayesh Kariya
5098a63fd1
adding swift unit test case
2015-02-17 18:09:33 +05:30
Mike Place
290b9216d9
Merge pull request #20666 from cachedout/returner_context
...
Returner context
2015-02-12 17:30:05 -07:00
Mike Place
065d5b8c57
Persistant connections (cleanup)
2015-02-12 17:01:45 -07:00
Mike Place
42dd4e6155
First stab at mysql pools with context
2015-02-12 17:01:08 -07:00
Mike Place
89f1bc9d6d
Add __context__ to returner loader
2015-02-12 17:01:08 -07:00
Nicole Thomas
bbb7ae9f4c
Merge pull request #20644 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-12 16:35:25 -07:00
Mike Place
5fa20ffc72
Merge pull request #20659 from atbell/fix_import_in_gpg_module
...
GH-20657: fixing import function in gpg module
2015-02-12 16:32:36 -07:00
Mike Place
c79bbe1aa4
Merge pull request #20668 from cachedout/lint_puppet
...
Lint
2015-02-12 16:25:53 -07:00
Mike Place
7075cee292
Lint
2015-02-12 16:57:42 -07:00
Mike Place
a7b38bd6d0
Merge pull request #20667 from belvedere-trading/develop
...
Added plugin-sync capabilities to the puppet module.
2015-02-12 16:24:46 -07:00
Mike Place
2b93b9d6ff
Merge pull request #20654 from saltstack/revert-19933-fix_mysql_returner_for_syndic_master_job_cache
...
Revert "fix mysql returner for syndic master job cache"
2015-02-12 16:19:22 -07:00
James Greenleaf
dc12f5021c
Merge "Added plugin-sync capabilities to the puppet module." into develop
2015-02-12 17:18:40 -06:00
Mike Place
84fc28b82b
Merge pull request #20658 from cxfcxf/develop
...
range interface support for vlan
2015-02-12 16:18:07 -07:00
Mike Place
95ca76622f
Merge pull request #20655 from SmithSamuelM/sam_20150212
...
Support for Raet 0.6.0 with enums
2015-02-12 16:16:40 -07:00
Mike Place
dde805296d
Merge pull request #20653 from tomashavlas/patch-1
...
onchages/onfail update for pyobjects
2015-02-12 16:14:01 -07:00
Harper, Dennis
6ad3bf59a4
Added plugin-sync capabilities to the puppet module.
...
Motivation:
To use puppet facts as grains, one would first want to sync the plugins. I could
have just decided to run a noop, which would do a plugin sync implicitly, however
there would be a lot of chaff in the output, and depending on the amount of changes
that puppet would do, could take a significant amount of time.
Implementation considerations:
I looked at the current implementation of the run method, and decided that
to generalize that method to be able to handle any generic puppet command
would turn to spaghetti code real quick, so I just add a separate method.
Change-Id: I6f9605ba31e2cf8cfc799004f5640558c4099a24
2015-02-12 15:58:59 -06:00
Aaron Bell
bf73397141
GH-20657: fixing import function
2015-02-12 13:42:18 -08:00
cxfcxf
4ddc1b13f0
range interface support for vlan
2015-02-12 13:39:23 -08:00
Thomas S Hatch
2d7b6b98ce
Revert "fix mysql returner for syndic master job cache"
2015-02-12 14:13:24 -07:00
Samuel M Smith
19acf4555c
Support for Raet 0.6.0 with enums
2015-02-12 13:58:42 -07:00
Colton Myers
7082c50375
Remove unused six import
2015-02-12 13:56:59 -07:00
tomashavlas
27868d669c
onchages/onfail update for pyobjects
...
possible solution for #20652
2015-02-12 21:51:52 +01:00
jfindlay
26c3c14ecb
Merge pull request #20645 from dsumsky/log_level_logfile_docu
...
- log_level_logfile and log_level configuration options inheritance docu...
2015-02-12 12:56:49 -07:00
Thomas S Hatch
bd3121f98f
Merge pull request #20624 from DSRCompany/stats_runner
...
Test for Stats Eventer deed
2015-02-12 12:43:14 -07:00
Thomas S Hatch
c204a57a4b
Merge pull request #20623 from DSRCompany/lazy_loader_non_key_fix
...
Raise KeyError for None key in lazy loader
2015-02-12 12:35:13 -07:00
Colton Myers
7e343465ad
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/msazure.py
tests/integration/fileserver/gitfs_test.py
2015-02-12 11:48:33 -07:00
dsumsky
6d797f50d4
- log_level_logfile and log_level configuration options inheritance docu updated
2015-02-12 19:47:59 +01:00
Nicole Thomas
e39d389e9c
Merge pull request #20636 from rallytime/merge-20622
...
Merge #20622 with whitespace fix
2015-02-12 10:46:21 -07:00
Thomas S Hatch
598f1196a7
Merge pull request #20618 from cxfcxf/develop
...
add ranged interface support for bond interface
2015-02-12 10:39:33 -07:00
Thomas S Hatch
174bc41a2c
Merge pull request #20593 from thusoy/iptables-refactor
...
Refactor iptables
2015-02-12 10:38:37 -07:00
Nicole Thomas
d0537457ed
Merge pull request #20617 from cachedout/cleanup
...
Minor style cleanup
2015-02-12 10:10:18 -07:00
rallytime
10520b9b85
Whitespace fix
2015-02-12 10:06:52 -07:00
Mike Place
876efa47da
Revert change in salt.cli.salt
2015-02-12 09:36:19 -07:00
Mike Place
f564f812c4
Indentation typo
2015-02-12 09:32:49 -07:00
Tarjei Husøy
5e05fd717a
Quote iptables args with leading/trailing spaces
2015-02-12 16:35:33 +01:00
Dmitry Kuzmenko
7f6b072f7a
Test for Stats Eventer deed
2015-02-12 13:42:37 +03:00
Dmitry Kuzmenko
787f43e394
Raise KeyError for None key in lazy loader
2015-02-12 13:41:33 +03:00
Tarjei Husøy
99aa865973
Set default iptables table to filter
...
Closes #18745 .
2015-02-12 11:02:25 +01:00
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
