David Boucha
b84f9756c5
updated Windows 2014.7.5-2 installer download link
2015-05-20 11:16:24 -06:00
Justin Findlay
868e807d8a
Merge pull request #23966 from jayeshka/modjk-states-unit-test
...
adding states/modjk unit test case
2015-05-20 11:11:48 -06:00
Thomas S Hatch
63164900bd
Merge pull request #23942 from jacobhammons/2015.5
...
Updates to sphinx saltstack2 doc theme
2015-05-20 09:43:54 -06:00
Jayesh Kariya
422a96497d
adding states/modjk unit test case
2015-05-20 15:31:46 +05:30
Nicole Thomas
587957badc
Merge pull request #23874 from joejulian/2015.5_tls_validate_kwargs
...
Validate keyword arguments to be valid
2015-05-19 22:53:40 -06:00
Justin Findlay
00c5c22867
Merge pull request #23960 from rallytime/bp-22114
...
Backport #22114 to 2015.5
2015-05-19 22:37:09 -06:00
Justin Findlay
4648b46e05
Merge pull request #23961 from rallytime/bp-23944
...
Backport #23944 to 2015.5
2015-05-19 22:35:41 -06:00
Nicole Thomas
0cb5cd3938
Merge pull request #23948 from jfindlay/augeas_changes
...
augeas.change state now returns changes as a dict
2015-05-19 22:00:10 -06:00
Ryan Lane
970d19a31e
Add missing loginclass argument to _changes call
2015-05-19 21:54:12 -06:00
Damian Myerscough
f3e1d63fce
Catch KeyError
2015-05-19 21:47:39 -06:00
Damian Myerscough
306b1ea6b8
Fixing KeyError
2015-05-19 21:47:39 -06:00
Damian Myerscough
6b2cda2861
Fix PEP8 complaint
2015-05-19 21:47:39 -06:00
Damian Myerscough
239e50f30d
Fixing KeyError when there are no additional pages
2015-05-19 21:47:39 -06:00
Justin Findlay
f09b80a8b5
augeas.change state now returns changes as a dict
2015-05-19 21:10:11 -06:00
Justin Findlay
2d185f78f7
Merge pull request #23957 from rallytime/bp-23951
...
Backport #23951 to 2015.5
2015-05-19 21:04:24 -06:00
Justin Findlay
ebff1ff967
Merge pull request #23956 from rallytime/bp-23906
...
Backport #23906 to 2015.5
2015-05-19 21:04:14 -06:00
Justin Findlay
da3f9197d3
Merge pull request #23955 from rallytime/bp-19305
...
Backport #19305 to 2015.5
2015-05-19 21:03:55 -06:00
Ryan Lane
996b431252
Update file.py
2015-05-19 19:48:26 -06:00
Ryan Lane
85d461f748
Do not check perms in file.copy if preserve
2015-05-19 19:48:26 -06:00
Stephen Spencer
9d87fd335c
add proper marker for format argument
2015-05-19 19:31:47 -06:00
Stephen Spencer
197688ef0c
Added exception handler to trap the RuntimeError raised when
...
Depends.enforce_dependency() class method fires unsuccessfully. There appears
to be no synchronization within the Depends decorator class wrt the
class global dependency_dict which results in incomplete population of any
loader instantiation occuring at the time of one of these exceptions.
This would mitigate the immediate affects of #23839 and #23373 .
2015-05-19 19:31:47 -06:00
TaiSHiNet
bbf2429bce
Fixes droplet listing past page 1
...
Affects creation and deletion (both failed if VM was outside page 1)
2015-05-19 19:26:45 -06:00
Colton Myers
02a78fce3d
Merge pull request #23940 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-05-19 16:37:57 -06:00
Jacob Hammons
31023c8915
Updates to sphinx saltstack2 doc theme
2015-05-19 15:54:28 -06:00
Justin Findlay
ee4c01bf30
Merge pull request #23932 from rallytime/bp-23908
...
Backport #23908 to 2015.5
2015-05-19 15:41:28 -06:00
Justin Findlay
70bd407920
Merge pull request #23931 from rallytime/bp-23880
...
Backport #23880 to 2015.5
2015-05-19 15:41:18 -06:00
Colton Myers
36f0065faf
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/client/ssh/wrapper/pillar.py
2015-05-19 15:23:37 -06:00
Colton Myers
913391207a
Merge pull request #23939 from basepi/v2014.7.6release
...
Add extended changelog to 2014.7.6 release notes
2015-05-19 15:21:00 -06:00
Colton Myers
32b65dc2a9
Add extended changelog to 2014.7.6 release notes
2015-05-19 15:18:29 -06:00
Colton Myers
5bdbf0af9b
Merge pull request #23898 from makinacorpus/lxc_profiles
...
Lxc profiles
2015-05-19 15:08:28 -06:00
Joe Julian
30102acd04
Fix py3 and ordering inconsistency problems.
2015-05-19 13:50:14 -07:00
Justin Findlay
b818f72dce
Merge pull request #23922 from garethgreenaway/23900_2015_5_bonding_interface_fixes
...
Fixes to debian_ip.py
2015-05-19 12:50:53 -06:00
nleib
5d520c9377
fix connection function to mongo
...
connecting to mongo using "pymongo.connection.Connection" did not work on different versions of mongo.
this change fixes the connection issue.
2015-05-19 12:42:16 -06:00
Bastiaan Bakker
8ce59a2e16
if setting client_config_dir to '~', expand path
2015-05-19 12:40:43 -06:00
Mathieu Le Marec - Pasquet
d9051a047a
lxc: systemd support
...
This fixes #23847
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
e8d674fed4
lxc: chroot fallback toggle
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
e2887a0d44
lxc: sync func name with develop
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
e96e345799
lxc more fixes (lxc.set_dns)
...
This fixes #23833
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
fdb64245d4
lxc: Fix salt config (no more a kwarg)
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
63e63fa527
repair salt cloud lxc api on develop
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
80eabe2703
lxc salt cloud doc
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
73f229d966
lxc: unificate saltconfig/master/master_port
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
Mathieu Le Marec - Pasquet
0bc1f08a6b
lxc: refactor a bit saltcloud/lxc interface
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:54 +02:00
Mathieu Le Marec - Pasquet
7a80370da9
lxc: get networkprofile from saltcloud
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:54 +02:00
Mathieu Le Marec - Pasquet
47acb2e159
lxc: default net profile has now correct options
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:54 +02:00
Mathieu Le Marec - Pasquet
7eadf4863c
lxc: select the appropriate default bridge
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:54 +02:00
Justin Findlay
b1c98a38ed
Merge pull request #23925 from jpic/fix/wrong_lxc_path
...
Fixed wrong path in LXC cloud documentation
2015-05-19 12:23:56 -06:00
Joe Julian
493f7ad5f0
Validate keyword arguments to be valid
...
If using a dereferenced dict to call create_ca_signed_cert the
**extensions kwargs will contain _all_ the kwargs. This causes errors
when dereferencing arguments.
This adds a test to ensure that the argument is the right type and
contains the right keys to be a valid extension.
Fixes issue 23872
2015-05-19 10:58:50 -07:00
Justin Findlay
7f6a716a8a
Merge pull request #23894 from whiteinge/doc-mock__all__
...
Add __all__ attribute to Mock class for docs
2015-05-19 11:17:35 -06:00
jpic
a4bcd75171
Fixed wrong path in LXC cloud documentation
2015-05-19 18:54:07 +02:00
