Pedro Algarvio
435afb6e26
No logging should be done in __virtual__
2015-01-15 01:22:35 +00:00
Pedro Algarvio
0ceda58bd6
Fix mock call.
2015-01-12 16:51:02 +00:00
Pedro Algarvio
9e121e3317
Fix brew unit tests
2015-01-12 02:30:38 +00:00
Pedro Algarvio
209c0f35c4
Fix stripped kwarg from the merge forward
2015-01-12 00:38:55 +00:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Thomas S Hatch
fc06a8bbc8
Merge pull request #19571 from s0undt3ch/hotfix/setup-salt-paths
...
Fix setup salt paths
2015-01-11 09:46:48 -07:00
Pedro Algarvio
014e1cd888
Merge pull request #19602 from rallytime/bp-19585
...
Backport #19585 to 2014.7
2015-01-11 15:38:58 +00:00
jfindlay
f554acc54c
Merge pull request #19616 from jfindlay/fix_win_servermanager
...
quote servermanager cmds
2015-01-10 15:27:09 -07:00
Pedro Algarvio
e2e535824a
Use SaltStackVersion since we don't yet know when Boron will come out
2015-01-10 21:18:51 +00:00
Pedro Algarvio
3f14678796
Throw an error when the time comes to remove the deprecated code.
2015-01-10 21:18:51 +00:00
Pedro Algarvio
8a6e0a38ed
Remove unnecessary code
2015-01-10 21:18:51 +00:00
Pedro Algarvio
b2c710e375
Salt path options are now global and default to None.
...
Since we now evaluate each `salt.syspath` entry one by one, we only set
the passed settings in the generated `_syspaths` module.
The default values will mandate unless explicitly overridden in the
setup stage.
Refs #19157 , #19160 , #19161
Fixes #19514
Closes #19515
2015-01-10 21:18:51 +00:00
Pedro Algarvio
86ca0bcb13
Evaluate paths one by one since some depend on others
2015-01-10 21:18:51 +00:00
Justin Findlay
19d31a78fc
quote servermanager cmds
2015-01-10 12:29:19 -07:00
Mike Place
329c8c5723
Merge pull request #19590 from basepi/supervisordvirtual
...
Always return True from supervisord virtual function
2015-01-10 08:56:36 -07:00
Mike Place
1277b71e2d
Typo
2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3
Async flag and test cleanup
2015-01-09 21:21:50 -07:00
Thomas S Hatch
30666861cd
Merge pull request #19584 from rallytime/bp-19574
...
Backport #19574 to 2014.7
2015-01-09 17:50:02 -07:00
Colton Myers
9659447266
Always return True from supervisord virtual function
...
Fixes #18044
2015-01-09 15:36:57 -07:00
rallytime
d6b3f69c19
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 13:10:09 -07:00
Nicole Thomas
e46ccc8210
Merge pull request #19579 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-09 12:51:48 -07:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Nicole Thomas
1079603c54
Merge pull request #19572 from jfindlay/cmd_fixes
...
fix some commands
2015-01-09 11:23:53 -07:00
Mike Place
d16544fcb9
Merge pull request #19577 from cachedout/sreq_2015
...
Adjust for a possible subtle bug in zeromq
2015-01-09 11:12:47 -07:00
Mike Place
2ee4bead9e
Adjust for a possible subtle bug in zeromq
2015-01-09 11:10:02 -07:00
Justin Findlay
acd2655770
fix some commands
2015-01-09 09:58:41 -07:00
Nicole Thomas
76c5d5a372
Merge pull request #19568 from rallytime/pylints
...
Pylint fix for 2015.2 branch
2015-01-09 09:16:53 -07:00
rallytime
ff1985567b
Pylint fix for 2015.2 branch
2015-01-09 09:14:44 -07:00
Thomas S Hatch
b02862ae72
Merge pull request #19547 from rallytime/bp-19380
...
Backport #19380 to 2015.2
2015-01-08 22:03:04 -07:00
Thomas S Hatch
4c17b14224
Merge pull request #19549 from rallytime/bp-19517
...
Backport #19517 to 2014.7
2015-01-08 22:02:25 -07:00
Thomas S Hatch
22c8a42180
Merge pull request #19552 from terminalmage/issue19540
...
Fix regression in pillar cache
2015-01-08 22:01:13 -07:00
Thomas S Hatch
47d1e65dfe
Merge pull request #19556 from rallytime/fix_brew_mod
...
Add python_shell kwarg to brew module
2015-01-08 22:00:38 -07:00
rallytime
a8c9f95ab8
Add python_shell kwarg to brew module
2015-01-08 17:09:25 -07:00
Thomas S Hatch
8dd6f36c0c
Merge pull request #19554 from rallytime/fix_disk_mod
...
Move python shell kwarg to correct place
2015-01-08 17:02:40 -07:00
rallytime
635898c850
Move python shell kwarg to correct place
2015-01-08 17:00:46 -07:00
Thomas S Hatch
2623aa672d
Merge pull request #19541 from jfindlay/fix_pip
...
change one more pip command
2015-01-08 16:44:59 -07:00
Thomas S Hatch
081c96c43f
Merge pull request #19537 from rallytime/bp-19344
...
Backport #19344 to 2014.7
2015-01-08 16:44:35 -07:00
Erik Johnson
1996656185
Look in local files for pillar data on masterless
2015-01-08 17:44:32 -06:00
Thomas S Hatch
7941a4a738
Merge pull request #19534 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-08 16:44:18 -07:00
Erik Johnson
e063c60691
Add a __pillar key to opts
2015-01-08 17:44:16 -06:00
Thomas S Hatch
31f825d9f2
Merge pull request #19539 from terminalmage/fix-archive-tests
...
Update archive tests to use python_shell=False
2015-01-08 16:43:09 -07:00
Thomas S Hatch
9f2ee27b02
Merge pull request #19542 from jfindlay/fixup_svn
...
fix svn module str + list error
2015-01-08 16:42:23 -07:00
Mike Place
854088c649
Merge pull request #19551 from cachedout/minor_note
...
Release note note
2015-01-08 16:41:46 -07:00
Mike Place
b419366443
Release note note
...
Fixes #18551
2015-01-08 16:41:20 -07:00
Nicole Thomas
c6bd6971d2
Merge pull request #19538 from rallytime/bp-19368
...
Backport #19368 to 2014.7
2015-01-08 16:39:05 -07:00
Flavian
3fe0ec8b58
Azure: catch a benign WindowsAzureConflictError when trying to create a
...
service that already exists. In delete if kwargs is None, set it to an
empty dict.
#19155
2015-01-08 16:23:28 -07:00
vs
10e772cf21
improve master.status to work with host fqdns/hostnames as well as ips
...
The former version only worked with IPs which is kind of limited and
has been reported as bugs.
2015-01-08 16:17:26 -07:00
rallytime
ea769829af
Fix my pylint errors
2015-01-08 15:09:55 -07:00
Colton Myers
174290b7aa
Add python_shell=False to all the linux_acl mocks
2015-01-08 14:29:41 -07:00
Justin Findlay
1768e429f5
fix svn module str + list error
2015-01-08 14:29:20 -07:00
