Aaron Bell
8e0bd5ac9e
Fixes #20322 , check for existing cert, return CN (not ca_name)
2015-02-03 00:15:23 -08:00
Jayesh Kariya
d1b4fce53e
removed pylint error
2015-02-03 13:34:01 +05:30
Thomas S Hatch
3ecaee37c5
Merge pull request #20311 from jacksontj/develop
...
Switch to compiled regex's
2015-02-03 00:13:09 -07:00
Jayesh Kariya
3ad563df91
adding locate unit test case
2015-02-03 12:06:11 +05:30
Jayesh Kariya
9d2dd056a6
adding keyboard unit test case
2015-02-03 12:04:47 +05:30
Jayesh Kariya
1ae01547e3
adding iptables unit test case
2015-02-03 12:02:56 +05:30
Jeremy Rosenbaum
2caf78021d
fix syndic getting user from kwarg
2015-02-02 16:17:17 -08:00
Colton Myers
068a23e390
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/daemons/flo/core.py
salt/fileclient.py
salt/utils/cloud.py
salt/utils/schedule.py
2015-02-02 15:27:43 -07:00
Thomas Jackson
48637b8267
Switch to compiled regex's
...
Performance!!
2015-02-02 14:01:31 -08:00
Thomas S Hatch
d1c0e067e5
Merge pull request #20310 from jacksontj/develop
...
Typo fix
2015-02-02 14:47:53 -07:00
Thomas Jackson
77ea42e549
Typo fix
2015-02-02 13:41:33 -08:00
Gareth J. Greenaway
edcb4cf4fe
Fixing pylint error
2015-02-02 12:34:33 -08:00
Nicole Thomas
4b94cfb4dc
Merge pull request #20269 from rallytime/refactor_localemod_tests
...
Fix broken localemod_test on develop
2015-02-02 12:56:56 -07:00
theonlypippo
7d6b8565b2
add 'ipv6-localhost/loopback' to punish list
...
reported in https://github.com/saltstack/salt/issues/20299
2015-02-02 14:00:37 -05:00
rallytime
a99b030e36
Mock salt.utils.which call
2015-02-02 11:55:11 -07:00
Seth House
ef0b32cb1a
Merge pull request #20283 from CameronNemo/CameronNemo-patch-1
...
Add Upstart job for salt-api
2015-02-02 11:41:36 -07:00
Jayesh Kariya
f021c43e97
adding introspect unit test case
2015-02-02 19:17:24 +05:30
Diego Woitasen
e6f64019a8
How to store Minion config options on Pillars.
2015-02-02 09:27:13 -03:00
Diego Woitasen
11bf6dd734
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2015-02-02 09:12:15 -03:00
Thomas S Hatch
971cfb36a3
Merge pull request #20291 from thatch45/react_fixes
...
Add id to beacon return data
2015-02-02 03:43:37 -07:00
Thomas S Hatch
eec9ac98e4
lint
2015-02-02 03:42:54 -07:00
Thomas S Hatch
eaff795bdd
Add id tot he beacon event dataset
2015-02-02 03:29:54 -07:00
Thomas S Hatch
9b9861076d
Add exc_info to the reactor error log
2015-02-02 03:27:15 -07:00
Gareth J. Greenaway
5499ea36b0
Iinitially adding the ability to specify a source line in the Debian interfaces file.
...
Finished up support for specifying a source in /etc/network/interfaces.
Also initial support for managing interface config files under /etc/network/interfaces.d
2015-02-01 16:21:53 -08:00
Cameron Norman
ffe1ba6995
Add Upstart job for salt-api
2015-01-31 18:11:34 -08:00
Joseph Hall
1a3e20c699
Merge pull request #20279 from techhat/decodedefault
...
Change default for decode in http.query()
2015-01-31 15:51:19 -07:00
Marvin Frick
6e0f205567
fixes weird wording in comment
2015-01-31 21:56:41 +01:00
Marvin Frick
16804c2d4d
fixes a bug which broke eauth with group permissions
2015-01-31 20:19:50 +01:00
Joseph Hall
1e4c10b1d8
Change default for decode in http.query()
2015-01-31 12:03:05 -07:00
Thomas S Hatch
b58fe7aaf4
Merge pull request #20273 from techhat/httpclientcert
...
Add handling for client-side certs to http.query()
2015-01-31 11:14:40 -07:00
Joseph Hall
bf84d7206b
Context is valid in Python 2.7.9
2015-01-31 08:52:29 -07:00
Seth House
34620811f9
Merge pull request #20277 from mzupan/develop
...
this supports complex grain types for map.jinja lookups
2015-01-31 08:37:26 -07:00
Joseph Hall
04e2b819bd
Forgot missing import
2015-01-31 04:50:03 -07:00
Mike Zupan
0d875bf94b
this supports complex grain types
2015-01-31 02:45:09 -08:00
Thomas S Hatch
cefb78efe9
Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize
...
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
2015-01-31 03:13:53 -07:00
Joseph Hall
394c8a601a
Add handling for client-side certs to http.query()
2015-01-30 18:59:10 -07:00
Seth House
8539c825f8
Merge pull request #20272 from saltstack/revert-20257-arghotfix
...
Revert "Only softfail with a state kwarg mismatch"
2015-01-30 17:48:29 -07:00
Pedro Algarvio
bb3162fca3
Revert "Only softfail with a state kwarg mismatch"
2015-01-31 00:42:22 +00:00
Nicole Thomas
d0cec3b90f
Merge pull request #20270 from rallytime/pylint_fix
...
Pylint disable StrictVersion import error
2015-01-30 17:33:20 -07:00
rallytime
310e9075bf
Pylint disable StrictVersion import error
2015-01-30 17:32:17 -07:00
rallytime
3dbe1b30d6
Fix broken localemod_test on develop
...
- Fixed failing gen_locale test
- Refactor test to match refactored gen_locale function
- Break out gen_locale tests into inividual unit tests
2015-01-30 17:23:32 -07:00
Mike Place
67ac39ae50
Merge pull request #20226 from thatch45/sudo_call
...
Allow sudo priv escalation
2015-01-30 16:43:21 -07:00
Mike Place
4d3b810ca3
Merge pull request #20264 from mzupan/develop
...
Added the default directory that gpg imports to
2015-01-30 16:41:46 -07:00
Pedro Algarvio
cc064fdc4a
Py3 compatibility
2015-01-30 23:37:36 +00:00
Pedro Algarvio
0bc66403b9
Py3 compatibility
2015-01-30 23:37:00 +00:00
Pedro Algarvio
44e255f489
Py3 compatibility
2015-01-30 23:36:34 +00:00
Pedro Algarvio
4443cba9ed
Py3 compatibility
2015-01-30 23:36:15 +00:00
Pedro Algarvio
04db610033
Py3 compatibility
2015-01-30 23:35:22 +00:00
Colton Myers
4318085f7a
Merge pull request #20267 from basepi/2015.2releasenotesonly_upgrade
...
Add only_upgrade to 2015.2 release notes
2015-01-30 16:08:50 -07:00
Colton Myers
ca6ecc0f0f
Add only_upgrade to 2015.2 release notes
2015-01-30 16:07:39 -07:00
