Kris Raney
|
08987a1698
|
Fix new lint warning
|
2015-12-30 22:43:38 -06:00 |
|
Kris Raney
|
26ded33d79
|
Reproduced the no-boto problem and fixed it.
|
2015-12-30 22:08:35 -06:00 |
|
Kris Raney
|
1fb44b0925
|
Try again to deal with missing boto
|
2015-12-30 20:46:01 -06:00 |
|
Mike Place
|
3652dbae76
|
Merge pull request #30090 from techhat/seeddirs
Add argument to isdir()
|
2015-12-30 15:41:01 -07:00 |
|
Mike Place
|
a12bda4b30
|
Merge pull request #30094 from rallytime/module_state_doc_fix
Fix doc formatting for cloud.create example in module.py state
|
2015-12-30 15:40:24 -07:00 |
|
Mike Place
|
040412b0b1
|
Merge pull request #30093 from zmalone/pillar-notes
Noting that file_roots and "state tree" should both be avoided
|
2015-12-30 15:40:05 -07:00 |
|
Mike Place
|
259a0582ac
|
Add docs
|
2015-12-30 15:39:18 -07:00 |
|
Mike Place
|
25edefc93a
|
Merge pull request #30097 from cachedout/note_on_password_process_list
Note concern about cleartext password in docs for shadow.gen_password
|
2015-12-30 15:37:33 -07:00 |
|
Herkermer Sherwood
|
aa9fcfa27c
|
Update call to sdecode for new location
sdecode was moved from utils to utils.locales so win_update needs
to reference the new location for the verbose reture to work.
|
2015-12-30 14:36:49 -08:00 |
|
Kris Raney
|
ee052615d1
|
Fix case when boto is not present
|
2015-12-30 16:34:58 -06:00 |
|
Mike Place
|
58aec884ef
|
Note concern about cleartext password in docs for shadow.gen_password
Closes #28120
|
2015-12-30 15:03:23 -07:00 |
|
Mike Place
|
ad9424820e
|
Add rm_special to crontab module
Closes #28171
|
2015-12-30 14:46:14 -07:00 |
|
Joseph Hall
|
d7f46b5438
|
Merge pull request #30095 from rallytime/select_query_linode
Add the list_nodes_select function to linode driver
|
2015-12-30 14:06:57 -07:00 |
|
rallytime
|
4731d9442e
|
Add the list_nodes_select function to linode driver
|
2015-12-30 13:40:52 -07:00 |
|
Joseph Hall
|
f7c7d9c7c2
|
Add lstrip
|
2015-12-30 13:28:39 -07:00 |
|
rallytime
|
8fbee322b9
|
Fix doc formatting for cloud.create example in module.py state
|
2015-12-30 13:16:53 -07:00 |
|
Zach Malone
|
cfbfd58afe
|
Noting that file_roots and "state tree" should both be avoided, because in some
environments, the actual states show up another level down. Adding notes about why this is undesirable.
|
2015-12-30 13:10:46 -07:00 |
|
Mike Place
|
6b1c3a6bf2
|
Merge pull request #30089 from mpreziuso/patch-1
Fixes terminology and adds more accurate details about the algorithms
|
2015-12-30 13:02:18 -07:00 |
|
Joseph Hall
|
c70257163b
|
Add argument to isdir()
|
2015-12-30 12:33:23 -07:00 |
|
Michele Preziuso
|
50533add40
|
Fixes terminology and adds more accurate details about the algorithms
Source: https://httpd.apache.org/docs/2.2/misc/password_encryptions.html.
|
2015-12-30 19:27:32 +00:00 |
|
Mike Place
|
200d09385d
|
Merge pull request #30086 from cachedout/issue_29921
Document that gitfs needs recent libs
|
2015-12-30 12:26:05 -07:00 |
|
Mike Place
|
8c29e2dd6a
|
Document that gitfs needs recent libs
Closes #29921
|
2015-12-30 12:00:33 -07:00 |
|
Mike Place
|
dce64c0868
|
Merge pull request #30082 from abednarik/fix_grain_saltversion_index
Fixed saltversioninfo grain return
|
2015-12-30 11:23:17 -07:00 |
|
Mike Place
|
893b30d3ab
|
Merge pull request #30083 from windoverwater/develop
#30030 - code takes a dict and the doc should match - and perhaps also point that out
|
2015-12-30 11:19:20 -07:00 |
|
Mike Place
|
5602b8833e
|
Merge pull request #30084 from rallytime/bp-29987
Back-port #29987 to 2015.8
|
2015-12-30 11:19:09 -07:00 |
|
Mike Place
|
f16a194a65
|
Merge pull request #30085 from abednarik/virtual_ret_pkgin_module
modules.pkgin: __virtual__ return err msg.
|
2015-12-30 11:18:59 -07:00 |
|
abednarik
|
ec8e6611cc
|
modules.pkgin: __virtual__ return err msg.
Updated message when system is not supported.
|
2015-12-30 14:17:48 -03:00 |
|
Aditya Kulkarni
|
16e1df90e9
|
Make sure output file works for salt cloud
|
2015-12-30 09:55:13 -07:00 |
|
Sean Jenkins
|
fb6e895bf0
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-12-30 09:43:05 -07:00 |
|
Mike Place
|
c010b0d341
|
Merge pull request #30079 from sitepoint/key_finger_fix
Ignore trailing whitespace in certificate file.
|
2015-12-30 09:00:23 -07:00 |
|
Mike Place
|
d09e69f3fc
|
Merge pull request #30057 from abednarik/virtual_ret_parted_module
modules.parted: __virtual__ return err msg.
|
2015-12-30 08:57:55 -07:00 |
|
Mike Place
|
9700524e40
|
Merge pull request #30077 from akissa/fix-inline-code-examples
fix inline documentation examples not rendering
|
2015-12-30 08:55:42 -07:00 |
|
Sean Jenkins
|
1d7ee7bed2
|
Merge remote-tracking branch 'origin/develop' into sean
|
2015-12-30 08:44:30 -07:00 |
|
Sean Jenkins
|
0ffea31666
|
Fix lint for PR30062
|
2015-12-30 08:35:18 -07:00 |
|
Sean Jenkins
|
f6a7aec310
|
Merge remote-tracking branch 'origin/develop' into sean
|
2015-12-30 08:21:33 -07:00 |
|
abednarik
|
882e9ac9ed
|
Fixed saltversioninfo grain return.
Looks like saltversioninfo is ruturning a string so there is no way to get values
by index. Updated return value to list.
Fixes #28763.
|
2015-12-30 12:14:00 -03:00 |
|
Sandy Currier
|
5cfe950614
|
#30030 - code takes a dict and the doc should match and perhaps also point that out
|
2015-12-30 10:10:28 -05:00 |
|
Adam Bolte
|
48fb7fd9f5
|
Ignore trailing whitespace in certificate file.
Fixes #30078
|
2015-12-30 18:36:44 +11:00 |
|
Andrew Colin Kissa
|
61ca281519
|
fix inline documentation examples not rendering
add missing modules to indexes
|
2015-12-30 07:35:57 +02:00 |
|
Nicole Thomas
|
cb3645e8b4
|
Merge pull request #30072 from rallytime/merge-forward-develop
Merge branch '2015.8' into 'develop'
|
2015-12-29 16:56:30 -07:00 |
|
Nicole Thomas
|
654cab0314
|
Merge pull request #30071 from rallytime/merge-forward-2015.8
Merge branch '2015.5' into '2015.8'
|
2015-12-29 16:17:59 -07:00 |
|
Nicole Thomas
|
1bf9853808
|
Merge pull request #30067 from lyft/boto-elb-stable-fix
Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly
|
2015-12-29 16:04:33 -07:00 |
|
Nicole Thomas
|
0a37c4de1a
|
Merge pull request #30069 from techhat/seeddirs
Ensure that pki_dir exists
|
2015-12-29 16:03:23 -07:00 |
|
Nicole Thomas
|
404414bf57
|
Merge pull request #30070 from cachedout/issue_27835
Add documentation on debugging salt-ssh
|
2015-12-29 16:00:06 -07:00 |
|
rallytime
|
ef9ecb830f
|
Use full version notation for versionadded tags in boto_iam.py
|
2015-12-29 15:52:42 -07:00 |
|
rallytime
|
c386d70742
|
Merge branch '2015.8' into 'develop'
Conflicts:
- salt/modules/alternatives.py
- salt/modules/boto_rds.py
- salt/modules/mount.py
- salt/states/boto_iam.py
|
2015-12-29 15:51:12 -07:00 |
|
rallytime
|
394d7548c5
|
Additional spelling fixes for boto_vpc module
|
2015-12-29 15:28:05 -07:00 |
|
rallytime
|
f7e58a241c
|
Merge branch '2015.5' into '2015.8'
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py
|
2015-12-29 15:27:03 -07:00 |
|
Mike Place
|
60431e342a
|
Add documentation on debugging salt-ssh
Closes #27835
|
2015-12-29 15:22:03 -07:00 |
|
Joseph Hall
|
0f05d49bde
|
Ensure that pki_dir exists
|
2015-12-29 15:07:26 -07:00 |
|