rallytime
|
eae3b9e30f
|
Merge branch 'carbon' into '2016.11'
No conflicts.
|
2016-11-07 08:15:42 -07:00 |
|
rallytime
|
3b56f8bce1
|
Merge branch '2016.3' into 'carbon'
Conflicts:
- doc/topics/event/master_events.rst
|
2016-11-07 08:13:57 -07:00 |
|
rallytime
|
41166aede4
|
Merge branch '2015.8' into '2016.3'
No conflicts.
|
2016-11-07 08:11:56 -07:00 |
|
Nicole Thomas
|
a9fe7ecf1a
|
Pylint fix for develop (#37513)
|
2016-11-07 08:05:59 -07:00 |
|
James Stocker
|
83f01a2e5f
|
Saltstack PPA is no longer maintained
|
2016-11-07 12:07:53 +00:00 |
|
Mike Place
|
ee1c911c31
|
Merge pull request #37505 from cetanu/develop
salt-cloud vmware driver: allow selection by id
|
2016-11-07 22:37:14 +13:00 |
|
Mike Place
|
7f02a56dec
|
Merge pull request #37504 from SolarisYan/patch-1
fix list_snapshots when the vm doesn't have a snapshot
|
2016-11-07 22:34:44 +13:00 |
|
Mike Place
|
2d924d0820
|
Merge pull request #37503 from cachedout/issue_36713
Catch loader error on returners without save_load
|
2016-11-07 22:33:57 +13:00 |
|
Mike Place
|
d95bf59f97
|
Merge pull request #37499 from cachedout/key_docs_clarify
Clarify docs on salt-key events
|
2016-11-07 22:33:20 +13:00 |
|
Mike Place
|
1dd1408ae6
|
Merge pull request #37500 from cachedout/remove_include_errors
Remove unused flag
|
2016-11-07 22:33:04 +13:00 |
|
Mike Place
|
4b6f1ab1c4
|
Merge pull request #37502 from cachedout/issue_37444
Log proper message on returners that cannot be loaded
|
2016-11-07 22:32:45 +13:00 |
|
Vasili Syrakis
|
2c45eb848a
|
allow selection by id
|
2016-11-07 14:39:52 +11:00 |
|
SolarisYan
|
decae0f07d
|
Update vmware.py
if the vmname does't have any snapshot,it will return all snapshots on all vm that with snapshots. but it should return none.fix it
|
2016-11-07 11:33:21 +08:00 |
|
Mike Place
|
5f7f971b2c
|
Catch loader error on returners without save_load
Refs #36713
|
2016-11-07 14:51:31 +13:00 |
|
Mike Place
|
4c5ab057ce
|
Remove debugging
|
2016-11-07 14:03:44 +13:00 |
|
Mike Place
|
17d01e4f4c
|
Log proper message on returners that cannot be loaded
Closes #37444
|
2016-11-07 14:01:46 +13:00 |
|
Mike Place
|
6c705b11e0
|
Remove unused flag
The 'include_errors' option does nothing and has been removed.
|
2016-11-07 13:20:34 +13:00 |
|
Mike Place
|
2758e74785
|
Clarify docs on salt-key events
Closes #37448
|
2016-11-07 13:03:40 +13:00 |
|
Mike Place
|
0855528b4e
|
Merge pull request #37487 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
|
2016-11-07 12:04:44 +13:00 |
|
Mike Place
|
2422dafd52
|
Merge pull request #37494 from sjorge/2016.3-osfam_map
Forgot to update os_family map in #37472
|
2016-11-07 11:18:54 +13:00 |
|
Mike Place
|
e653413dfc
|
Merge pull request #37495 from sjorge/2016.11-sunos_pkgsrc
Allow OmniOS and OpenIndiana to find libcrypto
|
2016-11-07 11:18:28 +13:00 |
|
Mike Place
|
41bd8e3f52
|
Merge pull request #37496 from mcalmer/fix-status-handling-in-sysv-init-scripts
fix status handling in sysv init scripts
|
2016-11-07 11:18:00 +13:00 |
|
Mike Place
|
e741a773a5
|
Merge pull request #37497 from terminalmage/release_notes
Update 2016.3.5 release notes with source_hash_name explanation
|
2016-11-07 11:17:40 +13:00 |
|
Erik Johnson
|
c08038d9ea
|
Update 2016.3.5 release notes with source_hash_name explanation
|
2016-11-06 11:53:41 -06:00 |
|
Michael Calmer
|
1fb2c4dfcf
|
fix status handling in sysv init scripts
|
2016-11-06 18:49:12 +01:00 |
|
Super-User
|
52c3f159a9
|
handle other Solaris-like distributions that use pkgsrc the same as SmartOS
|
2016-11-06 14:19:02 +01:00 |
|
Super-User
|
96ba545492
|
Forgot to update os_family map in #37472
|
2016-11-06 14:06:34 +01:00 |
|
Mike Place
|
f4426c2233
|
Merge pull request #37486 from twangboy/fix_win_docs
Add requirement for PowerShell 3 on Windows
|
2016-11-06 19:01:07 +13:00 |
|
Mike Place
|
a1f355a569
|
Merge pull request #37493 from cachedout/minion_master_sdb
Add sdb support to minion and master configs
|
2016-11-06 19:00:18 +13:00 |
|
Mike Place
|
2226207a13
|
Merge pull request #37251 from shorawitz/patch-3
Create postgres.py
|
2016-11-06 15:05:08 +13:00 |
|
Mike Place
|
33d0789f6e
|
Merge pull request #37348 from alexbleotu/create_cluster-gh
Create cluster gh
|
2016-11-06 15:02:41 +13:00 |
|
Mike Place
|
4a8df6591d
|
Merge pull request #37431 from tyagiprince/develop
Fixed influxdb returner
|
2016-11-06 15:01:19 +13:00 |
|
Mike Place
|
70aff29b3b
|
Merge pull request #37451 from pakdel/list_repo_pkgs__showduplicates
yumpkg.list_repo_pkgs always shows duplicates
|
2016-11-06 15:00:27 +13:00 |
|
Mike Place
|
43bef720e5
|
Merge pull request #37432 from Tanoti/elasticsearch_proxy_support
Added proxy support to elasticsearch using requests backend module
|
2016-11-06 14:58:09 +13:00 |
|
Mike Place
|
be93710fee
|
Merge pull request #37452 from rallytime/fix-31135
file.line with mode=replace on an empty file should return False, not stacktrace
|
2016-11-06 14:55:11 +13:00 |
|
Mike Place
|
b678e7353d
|
Merge pull request #37465 from lorengordon/jinja-filters
Adds a couple handy jinja filters, `escape_regex` and `unique`
|
2016-11-06 14:54:20 +13:00 |
|
Mike Place
|
9ce38fd4d6
|
Merge pull request #37466 from alexbleotu/test_rename-gh
Renamed salt.utils.vmware.update_cluster tests
|
2016-11-06 14:52:55 +13:00 |
|
Mike Place
|
1d33aa10dc
|
Merge pull request #37467 from gtmanfred/develop
clean up pylint in virtualenvs
|
2016-11-06 14:51:35 +13:00 |
|
Mike Place
|
129b0387e6
|
Merge pull request #37469 from terminalmage/issue29010
Rewrite file.extract_hash to improve its matching ability
|
2016-11-06 14:50:01 +13:00 |
|
Mike Place
|
59ab1b4357
|
Merge pull request #37471 from twangboy/fix_win_file
Fix file.managed for Windows
|
2016-11-06 14:49:05 +13:00 |
|
Mike Place
|
9426b9d5c4
|
Merge pull request #37472 from sjorge/2016.3-solaris-grains
2016.3 solaris grains improvements
|
2016-11-06 14:46:09 +13:00 |
|
Mike Place
|
9e4e936f4f
|
Merge pull request #37473 from m03/fix-167-logrotate-state_2
Fix #167 - Add logrotate state module
|
2016-11-06 14:45:15 +13:00 |
|
Mike Place
|
706befd8ca
|
Merge pull request #37476 from pakdel/ec2_cloud_driver_fix
EC2 support for SubnetName and securityGroupName
|
2016-11-06 14:43:09 +13:00 |
|
Mike Place
|
1c993bf8c2
|
Merge pull request #37488 from SaltyCharles/patch-3
update note on beacon.disabled
|
2016-11-06 14:35:31 +13:00 |
|
Mike Place
|
bc17271aae
|
Merge pull request #37490 from twangboy/win_dacl_util
Create new salt util win_dacl
|
2016-11-06 14:35:12 +13:00 |
|
Mike Place
|
713607c0ee
|
Merge pull request #37489 from lorengordon/issue-18836
Creates `filter_by` as a utils function
|
2016-11-06 14:34:52 +13:00 |
|
Mike Place
|
9761a462c2
|
Add sdb support to minion and master configs
|
2016-11-06 14:29:40 +13:00 |
|
twangboy
|
f4df20d5be
|
Fix some lint
|
2016-11-04 22:17:05 -06:00 |
|
twangboy
|
d8ce75ec42
|
Clean up docs
|
2016-11-04 19:01:36 -06:00 |
|
twangboy
|
ffb21ae882
|
Fix some syntax errors, string type checks
|
2016-11-04 18:46:20 -06:00 |
|