Commit Graph

15598 Commits

Author SHA1 Message Date
Seth House
74fb3c514f Pull latest release version into the docs conf 2013-07-15 15:10:34 -06:00
Thomas S Hatch
dc7662c8ce Merge pull request #6167 from tgecho/develop
Allow pip paths to use the file:// protocol and allow local files or directories in find_links.
2013-07-15 14:01:07 -07:00
Thomas S Hatch
d03d571b0f Merge pull request #6146 from makinacorpus/develop
fix/feat: let the syndic be way more configurable
2013-07-15 13:59:56 -07:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Thomas S Hatch
630feea240 Merge pull request #6164 from s0undt3ch/issues/6158-log-deprecation-warning
Lint fixes
2013-07-15 08:09:43 -07:00
Thomas S Hatch
0333d31d9b Merge pull request #6161 from davromaniak/develop
displaying secondary ip addresses in the ip_interface grain.
2013-07-15 08:08:55 -07:00
Erik Simmler
3e00805aaa Allow pip paths to use the file:// protocol and allow local files or directories in find_links. 2013-07-15 11:02:12 -04:00
Pedro Algarvio
22d3986863 Local variables should not be uppercased. 2013-07-15 12:38:37 +01:00
Pedro Algarvio
f6be07069a Adapt .pylintrc design settings to Salt's reality. 2013-07-15 12:37:46 +01:00
Victor Galkin
aa3a7189c9 Add connections args to other methods 2013-07-15 14:11:56 +04:00
Xavier Barbosa
da27dd4e37 clean up 2013-07-15 11:12:23 +02:00
Xavier Barbosa
22e1da9148 changed dateutil by timelib saltstack/salt#6088 2013-07-15 11:12:23 +02:00
Xavier Barbosa
2c63eb00cf added documentation saltstack/salt#6088 2013-07-15 11:12:23 +02:00
Xavier Barbosa
00e373b63b added unittests for strftime filter saltstack/salt#6088 2013-07-15 11:12:21 +02:00
Xavier Barbosa
89ac049e8d allows to format any time derivated objects into jinja saltstack/salt#6088 2013-07-15 11:09:46 +02:00
Cyril Lavier
1ea6674267 displaying secondary ip addresses in the ip_interface grain. 2013-07-15 09:52:50 +02:00
Victor Galkin
afd61646b3 Merge branch 'develop' of github.com:saltstack/salt into develop 2013-07-15 09:25:13 +04:00
Victor Galkin
fbb7815546 Bypass mysql connection arguments 2013-07-15 09:23:56 +04:00
Thomas S Hatch
82759b9402 Merge pull request #6159 from s0undt3ch/issues/6158-log-deprecation-warning
Stop the `__new__` deprecation warning on `salt.log`. Fixes #6158.
2013-07-14 21:46:22 -07:00
Pedro Algarvio
4ef626246e Stop the __new__ deprecation warning on salt.log. Fixes #6158. 2013-07-15 00:40:34 +01:00
Pedro Algarvio
d6b1e60fb1 Added a mocked test case for pip.list with prefix matching. 2013-07-14 20:53:36 +01:00
Pedro Algarvio
21ea17a1c5 Handle nested dictionaries when converting from an OrderedDict into a dict. 2013-07-14 20:06:23 +01:00
Pedro Algarvio
6d40a18b4a Minor Typo. 2013-07-14 20:06:23 +01:00
Thomas S Hatch
2929549adb Merge pull request #6157 from s0undt3ch/hotfix/pip-logic-improvements
Pip logic improvements and **way** lot more tests!
2013-07-14 11:55:41 -07:00
Pedro Algarvio
01f489c79d Added a mocked test case for pip.list. 2013-07-14 19:30:08 +01:00
Pedro Algarvio
c83e767e06 Added a mocked test case for pip freeze. 2013-07-14 19:25:44 +01:00
Pedro Algarvio
e17599a820 Added a mocked test case for --timeout passing to pip uninstall. 2013-07-14 19:02:41 +01:00
Pedro Algarvio
71c278384b Added a mocked test case for --log passing to pip uninstall. 2013-07-14 19:01:27 +01:00
Pedro Algarvio
3e97e36e78 Added a mocked test case for --proxy passing to pip uninstall. 2013-07-14 18:59:23 +01:00
Pedro Algarvio
ebd8516a8b Let's have the packages to uninstall as the last arguments to the pip.uninstall call. 2013-07-14 18:59:23 +01:00
Pedro Algarvio
95ee5a9f36 Added a mocked test case for --proxy passing to pip install. 2013-07-14 18:59:22 +01:00
Pedro Algarvio
315c1f911d Added a mocked test case for multiple --requirements passing to pip uninstall. 2013-07-14 18:59:22 +01:00
Pedro Algarvio
fd94e7cba4 Fix multiple requirements for both install and uninstall.
* Fixed typo when copying requirements file to the temporary file for `pip.install`.
* Handling of the requirements file(s) was totally different on `pip.uninstall` when it the intended result is supposed to be the same(regarding the requirements file of course, not install/uninstall). Fixed it, and to fix it `no_chown` was also added in `pip.uninstall`, if it's needed to install, it should also be needed to uninstall.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
5435dc69e1 Added a mocked test case for multiple --requirements passing to pip install. 2013-07-14 18:59:22 +01:00
Pedro Algarvio
fdd7d2debf pip accepts multiple requirements files, so does salt.modules.pip now! 2013-07-14 18:59:22 +01:00
Pedro Algarvio
411c926146 Prefix tests with install since they're testing the install command. 2013-07-14 18:59:22 +01:00
Pedro Algarvio
02034c4d86 Added a mocked test case for --no-install passing to pip install. 2013-07-14 18:59:18 +01:00
Pedro Algarvio
716f760e80 Added a mocked test case for --no-deps passing to pip install. 2013-07-14 18:59:13 +01:00
Pedro Algarvio
89fa6cecf4 Added a mocked test case for --ignore-installed passing to pip install. 2013-07-14 18:59:08 +01:00
Pedro Algarvio
892646bdee Added a mocked test case for --force-reinstall passing to pip install. 2013-07-14 18:59:01 +01:00
Pedro Algarvio
03c88dac2c Added a mocked test case for --upgrade passing to pip install. 2013-07-14 18:58:56 +01:00
Pedro Algarvio
27959701dc Added support and a mocked test case for --global-options passing to pip install. 2013-07-14 18:58:49 +01:00
Pedro Algarvio
fd200c96b0 Added a mocked test case for --install-options passing to pip install.
* Replaced all occurrences of `basestring` with the `string_types` from salt's `_compat` module.
* Properly split install options on commas.
* Install options need to be quoted.
2013-07-14 18:58:44 +01:00
Pedro Algarvio
12d05e4b9a Added a mocked test case for --exists-action passing to pip install.
* `exists_action` now only accepts it's valid settings, one of `s`, `i`, `w`, `b`, else, `CommandExecutionError`.
2013-07-14 18:58:37 +01:00
Pedro Algarvio
fb16313804 Added a mocked test case for --source passing to pip install. 2013-07-14 18:58:33 +01:00
Pedro Algarvio
85b0d7964d Added a mocked test case for --no-download passing to pip install. 2013-07-14 18:58:28 +01:00
Pedro Algarvio
60ef910bad Added a mocked test case for --download-cache passing to pip install. 2013-07-14 18:58:24 +01:00
Pedro Algarvio
bfcd91d700 Added a mocked test case for --download passing to pip install. 2013-07-14 18:58:12 +01:00
Pedro Algarvio
6fbbd5fb31 Added a mocked test case for --target passing to pip install. 2013-07-14 18:58:06 +01:00
Pedro Algarvio
aa8dda75c7 Added a mocked test case for --build passing to pip install. 2013-07-14 18:57:58 +01:00