Commit Graph

46225 Commits

Author SHA1 Message Date
Jayesh Kariya
d91b36a8fc adding etcd_mod unit test case 2015-02-03 16:59:26 +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
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
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
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
Cameron Norman
ffe1ba6995 Add Upstart job for salt-api 2015-01-31 18:11:34 -08: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
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
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
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
Mike Place
eef6519830 Merge pull request #20266 from cachedout/tornado_version_detect
Tornado version detect
2015-01-30 16:03:18 -07:00
Mike Place
710bb63103 Typo 2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904 Better detection for minimum pyzmq version 2015-01-30 16:01:59 -07:00
Pedro Algarvio
f0f3fb2de6 Add __instance_id__ as a known global variable 2015-01-30 22:27:20 +00:00
Pedro Algarvio
b9aaf9fe72 Py3 compatibility 2015-01-30 22:27:20 +00:00
Pedro Algarvio
f6e465f9e5 Py3 compatibility 2015-01-30 22:27:20 +00:00
Pedro Algarvio
322f26a7e1 Py3 compatibility 2015-01-30 22:27:20 +00:00
Pedro Algarvio
a817a42e50 Py3 compatibility 2015-01-30 22:27:19 +00:00
Pedro Algarvio
21cb7e2a92 Py3 compatibility 2015-01-30 22:27:19 +00:00
Pedro Algarvio
661a8eb12e Py3 compatibility 2015-01-30 22:27:19 +00:00
Pedro Algarvio
9e2f3ab300 Py3 compatibility 2015-01-30 22:27:19 +00:00
Pedro Algarvio
f53894706e Py3 compatibility 2015-01-30 22:27:19 +00:00
Pedro Algarvio
29b519fe88 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
c7961d34bc Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
4781f89b01 Stop PyLint from complaining 2015-01-30 22:27:16 +00:00
Pedro Algarvio
f708b808f2 Make the check conditional to the python version 2015-01-30 22:27:16 +00:00
Pedro Algarvio
a983495a26 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
98a61ff6d7 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
6030335844 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
92d321b732 Py3 compatibility 2015-01-30 22:27:15 +00:00
Pedro Algarvio
95ef4fd9a1 Py3 compatibility 2015-01-30 22:27:15 +00:00
Pedro Algarvio
c3a543b3e7 Fix bug introduced while linting 2015-01-30 22:27:15 +00:00
Pedro Algarvio
2a850bc6cb Options should not be globally defined. Do the right thing. 2015-01-30 22:27:15 +00:00
Pedro Algarvio
ea7381b199 Typos 2015-01-30 22:27:15 +00:00
Pedro Algarvio
4d6f173d75 Fix wrong iteration from PY3 compat changes 2015-01-30 22:27:15 +00:00
Pedro Algarvio
56ec78408d Convert into dict(lost in PY3 refactoring) 2015-01-30 22:27:15 +00:00
Pedro Algarvio
1c8490bcf9 Py3 compatibility 2015-01-30 22:27:15 +00:00