valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,815 Commits 24 Branches 182 Tags 341 MiB
e2f6d74680
Commit Graph

75815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11' 
Conflicts:
  - salt/modules/file.py
 2016-11-09 12:56:58 -07:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
Nicole Thomas
7036707fbf Back-port #37569 and #37581 to 2016.11 (#37585) 
* Remove known issues section for rc2

All of these have been fixed in the latest rc

* Add smartOS RC build instructions back to RC docs

And update the links to the new packages
 2016-11-09 10:39:07 -07:00
Nicole Thomas
b24992ea38 Update release candidate docs with RC2 info (#37568) 2016-11-09 10:19:11 -07:00
Nicole Thomas
2c6a8748fe Add smartOS RC build instructions back to RC docs (#37581) 
And update the links to the new packages
 2016-11-09 10:09:03 -07:00
Mrten
772a19db9a Fix typo 2016-11-09 17:36:39 +01:00
Mrten
208eb10bd3 Added a hint how to run random sqlite queries 2016-11-09 17:31:47 +01:00
Dmitry Kuzmenko
aec6d55b7c Basic SSL/TLS support in master-minion communication. 
Allows to set paths to `ssl_cert` and `ssl_key` in master and minion
opts. Encrypts the TCP channel with the given keys for tcp transport.
 2016-11-09 16:03:47 +03:00
Tobias Macey
4efc7727a9 Fixing check for parameter group 
The current implementation will return an invalid response if the
requested parameter group is not present. Added a check for the
parameter group not found error case and set the exists value in the
return to False.
 2016-11-09 07:26:25 -05:00
SK
e8d8d9211b Fix: change tuples to list for key+cert pairs (https). 2016-11-09 13:48:33 +03:00
Nicole Thomas
19dcace679 Remove known issues section for rc2 (#37569) 
All of these have been fixed in the latest rc
 2016-11-08 16:46:01 -07:00
Mike Place
43a2e51d94 Merge pull request #37544 from github-abcde/features/pillar_enc_in_orchestrate 
Added pillar_enc variable to orchestrate to be passed through
 2016-11-09 12:17:26 +13:00
Mike Place
b01c247ea9 Merge pull request #37553 from rallytime/bp-37521 
Back-port #37521 to 2016.3
 2016-11-09 12:11:07 +13:00
Mike Place
694df30d40 Merge pull request #37565 from rallytime/bp-37549 
Back-port #37549 to 2016.3
 2016-11-09 12:10:25 +13:00
Nicole Thomas
0564532924 Update release candidate docs with RC2 info (#37564) 2016-11-08 15:26:37 -07:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562) 
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
 2016-11-08 14:58:33 -07:00
Seth House
ac754dbac5 Skip config type checking for sdb values (#37560) 2016-11-08 14:57:47 -07:00
Nicole Thomas
0fe7b37e1d Merge pull request #37561 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-08 14:39:52 -07:00
Mrten
c92a90b8e5 Update sqlite3.py 
change boron to 2016.3.0. as requested
 2016-11-08 14:11:00 -07:00
Mrten
fb76557a2a sqlite is not found in 2015.8 
first appearance is boron
 2016-11-08 14:10:59 -07:00
Mrten
43bef5fbb9 sqlite is not found in 2015.8 (#37549) 
* sqlite is not found in 2015.8 

first appearance is boron

* Update sqlite3.py

change boron to 2016.3.0. as requested
 2016-11-08 14:09:51 -07:00
Nicole Thomas
2e8e56ca69 [PY3] Change log.warn statements to log.warning (#37531) 
* [PY3] Change log.warn statements to log.warning

log.warn is deprecated in Python 3. This change removes the
occurance of deprecation warnings for using log.warn. For example:

```
17:24:23 [WARNING ] /testing/salt/utils/verify.py:522: DeprecationWarning: The 'warn' method is deprecated, use 'warning' instead
17:24:23   log.warn('Insecure logging configuration detected! Sensitive data may be logged.')
17:24:23
17:24:23 [WARNING ] Insecure logging configuration detected! Sensitive data may be logged.
```

* Tweak unit.utils.verify_test to using warning instead of warn
 2016-11-08 13:06:54 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
 2016-11-08 13:04:33 -07:00
Nicole Thomas
453319b50a Don't pass the vpc id to boto.vpc.create_internet_gateway func (#37556) 
That function's namespace looks like this:
```
def create_internet_gateway(self, dry_run=False):
```
So when we pass in the vpc_id opbject in the test, the check later
in the function sets `dry_run=True` since the vpc_id opbject exists.

This later throws JSONResponseErrors because the `DryRun` flag is
set. This error raising functionality was added in the most recent
version of moto, which exposed this bug.

This fixes the three boto_vpc_test unit state tests. We'll see if
other tests need to be addressed in other files on a full test run.
 2016-11-08 12:48:26 -07:00
Tobias Macey
b01686e94d Fix parameter handling for boto_rds with boto3 
The way that optional parameters are handled forces some of them to be
defined even when that is not necessary. Updated handling to use a
mapping of snake_case to CamelCase names and only include defined
parameters in the call to boto for the `create` and `modify` actions.
 2016-11-08 12:24:36 -05:00
Alexey Genus
30f92b05f4 refresh_pillar() should be called always 2016-11-08 09:57:35 -07:00
Eric Radman
4cd92980d8 Use 'driver' instead of 'provider' in test cloud configs (#37547) 
Running the tests currently provokes a warning from
salt/config/__init__.py:│2275 ("'provider' will be
deprecated in the Nitrogen release")
 2016-11-08 09:50:39 -07:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
herbert.buurman
68f445f197 Added pillar_enc variable to orchestrate to be passed through 2016-11-08 12:47:30 +01:00
Mike Place
72b4292a79 Merge pull request #37537 from cachedout/matcher_unit_tests 
Additional unit tests
 2016-11-08 23:01:02 +13:00
Yoram Hekma
93a59f8034 Added prefix to tempfile for template 
__clean_tmp() only cleans files that have salt.utils.files.TEMPFILE_PREFIX as a prefix, which the jinja rendering didn't set. This causes the /tmp directory to fill up more with each salt run.
 2016-11-08 10:48:26 +01:00
Mike Place
610a198322
Lint 2016-11-08 19:40:48 +13:00
Mike Place
3e848ad126
Cache tests 2016-11-08 18:49:10 +13:00
Mike Place
e13cee7d70 Merge pull request #37532 from The-Loeki/opt-backend 
Backend config: Propagate usage, deprecate requests_lib
 2016-11-08 16:33:33 +13:00
Mike Place
efef3948ad
Add unit tests for minion targeting 2016-11-08 16:27:36 +13:00
Mike Place
96b8b9a849 Merge pull request #37457 from rallytime/fix-31081 
Fixup file.line docs to be more clear and consistent
 2016-11-08 13:29:20 +13:00
Mike Place
8b0f280998 Merge pull request #37509 from Rumbles/rumbles 
Saltstack PPA is no longer maintained - update docs
 2016-11-08 13:27:14 +13:00
Mike Place
6d2b2e1881 Slight grammar fix 2016-11-08 13:27:06 +13:00
Mike Place
221f84399d Merge pull request #37518 from Tanoti/elasticsearch_returner_improvements 
Improvements and fixes to elasticsearch returner
 2016-11-08 13:24:34 +13:00
Mike Place
7de790ffed Merge pull request #37526 from twangboy/fix_35799 
Remove loop from dsc.apply_config
 2016-11-08 13:23:11 +13:00
Mike Place
94811df2ea Merge pull request #37534 from rallytime/bp-merge-foward-fix 
Back-port fix needed from #37515
 2016-11-08 13:14:46 +13:00
Mike Place
17adbb0c9f Merge pull request #37533 from whiteinge/salt-api-504-timeouts 
Return a 504 response instead of 500 for Salt timeouts
 2016-11-08 13:14:15 +13:00
Ronald van Zantvoort
cb445550a6 typofix 2016-11-08 01:13:12 +01:00
Mike Place
a9f03eee6f Merge pull request #37529 from lorengordon/bp-36736 
Backport: PR 36736 to 2016.3
 2016-11-08 13:04:10 +13:00
Erik Johnson
d1b2af1d69 Add missing source_hash_name args to a couple funcs 
file.check_managed and file.check_managed_changes both were missing this
new argument. This commit adds it in all places where these functions
are used.
 2016-11-07 16:26:25 -07:00
Nicole Thomas
2f6bb3325f Merge pull request #37515 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-11-07 16:24:34 -07:00
Seth House
63226aeda6 Return a 504 response instead of 500 for Salt timeouts 2016-11-07 16:23:17 -07:00
Ronald van Zantvoort
217523653f StormPath state: take backend as param for httperrors, deprecate requests_lib:True 2016-11-08 00:07:43 +01:00
Mike Place
19475aada6 Merge pull request #37519 from rallytime/returner-load-errors 
Update returner __virtual__() return messages for loader
 2016-11-08 12:06:22 +13:00
Mike Place
c2984a9c9c Merge pull request #37521 from genuss/fix_refresh_pillar 
refresh_pillar() should be called always with refresh=True during saltutil.sync_all
 2016-11-08 12:05:52 +13:00