valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,924 Commits 24 Branches 182 Tags 341 MiB
514d6012f3
Commit Graph

73924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
514d6012f3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-20 10:49:36 -06:00
Nicole Thomas
2bb20a8488 Merge pull request #36361 from garrettheel/github-fixes-and-improvements 
Bug fixes and privacy disable feature for github state
 2016-09-20 09:47:48 -06:00
Mike Place
2b49a45768 Merge pull request #36431 from cachedout/psutil_os_x 
Try/except psutil process access in OSX
 2016-09-20 22:05:42 +09:00
Mike Place
67b78c7d97 Merge pull request #36423 from kraney/boto_apigateway_usage_plan 
Boto apigateway usage plan
 2016-09-20 15:47:03 +09:00
Mike Place
2789294a16 Merge pull request #36407 from skizunov/develop4 
PY3: Fix "file.managed" state
 2016-09-20 15:44:48 +09:00
Mike Place
8a6162214b Merge pull request #36405 from skizunov/develop3 
PY3: Fix error when applying salt state
 2016-09-20 15:44:10 +09:00
Mike Place
6c1b3f5af4
Lint 2016-09-20 15:40:00 +09:00
Mike Place
d0f44c95f5
Try/except psutil process access in OSX 
Refs https://github.com/saltstack/qa/issues/244
 2016-09-20 14:35:25 +09:00
Garrett Heel
f1e293c28a Bug fixes and privacy disable feature for github state 2016-09-20 11:01:15 +09:00
Thomas S Hatch
5d2f952052 Merge pull request #36414 from cro/clean_old_jobs_interval2 
Use better check for jobs to clean and archive
 2016-09-19 16:37:31 -06:00
Nicole Thomas
5dc06a3a29 Merge pull request #36421 from rallytime/bp-36395 
Back-port #36395 to carbon
 2016-09-19 15:55:54 -06:00
Winston Liu
df8648d5e3 lint clean up's. 2016-09-19 14:52:41 -07:00
kbelov
632de87807 Merge branch 'boto_apigateway_usage_plan' of https://github.com/kraney/salt into boto_apigateway_usage_plan 2016-09-19 14:38:59 -07:00
kbelov
b61dc5abda added unit tests for boto_apigateway module for usage plans and usage plan associations 2016-09-19 14:37:52 -07:00
Rajvi Dhimar
bb439eacde Update carbon.rst 2016-09-19 14:33:12 -06:00
Nicole Thomas
b658de4c33 Merge pull request #36412 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-19 12:59:18 -06:00
Nicole Thomas
098cf87a6b Merge pull request #36411 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-19 12:59:08 -06:00
C. R. Oldham
3508d358d8 Use better check for jobs to clean and archive 2016-09-19 12:24:48 -06:00
Winston Liu
962b0439a5 rest of the unit tests for usage plans related functionality in boto_apigateway module. 2016-09-19 10:54:38 -07:00
rallytime
2f9c4268f7 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-19 11:21:55 -06:00
rallytime
bdb15217d3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-19 11:21:02 -06:00
skizunov
faae3da84c Add 'coalesce' option to inotify beacon (#36404) 
See comments in the beacon for details on the 'coalesce' option.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-19 11:18:12 -06:00
Winston Liu
802fe3a76c make sure we don't call update_usage_plan in _update_usage_plan_apis if patchOperations is an empty list. 2016-09-19 10:16:48 -07:00
Nicole Thomas
acfce59666 Removes extra empty lines in the disk specificity example (#36410) 2016-09-19 11:13:08 -06:00
Aditya Kulkarni
892df0c089 Add ability to specify disk backing mode for VMware cloud profile (#36334) 
* Add ability to specify disk backing mode for VMware cloud profile

* Update release notes and version added
 2016-09-19 11:05:49 -06:00
Winston Liu
37a0f17191 unit tests for describe/create usage plan. 2016-09-19 09:43:36 -07:00
Winston Liu
e120f21021 fixed bug in update_usage_plan 2016-09-19 09:38:11 -07:00
Sergey Kizunov
d2edbf139a PY3: Fix "file.managed" state 
- When writing to a binary file in Python 3, the data type must
be `bytes`.
- `contextlib.nested` is not available in Python 3. Although
`contextlib.ExitStack` is an option (which would require different
code for Python 2 and Python 3 since `contextlib.ExitStack` is not
available in Python 2), it is much simpler just to use separate `with`
statements.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-19 10:57:17 -05:00
Sergey Kizunov
14a14f1ce1 PY3: Fix error when applying salt state 
In Python 3, a command such as:

```
salt-call state.apply mystate
```

On certain SLS files (in my case a `py` rendered file) could yield an
error such as:

```
[ERROR   ] Data transport is broken, got: #!py
---SLS file contents here---
, type: str, exception: a bytes-like object is required, not 'str',
retry attempts exhausted
```

Change `RemoteClient.get_file` to ensure the `data` passed to `write` is
a `bytes` type in Python 3.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-19 10:56:55 -05:00
Rajvi Dhimar
4ba4d2afbe Update carbon.rst (#36395) 2016-09-19 09:43:56 -06:00
Emanuel Rietveld
ff7883e336 Some modules (e.g. boto_* ones) require utils to be loaded. (#36398) 2016-09-19 09:42:51 -06:00
Mike Place
30d5a7874e Merge pull request #36291 from mchugh19/zabbix_get_template 
add zabbix template.get function
 2016-09-18 10:31:48 +09:00
Christian McHugh
0a21ce9aa2 correct key check 2016-09-17 15:58:28 +01:00
Mike Place
602bd2d1ef Merge pull request #36389 from cachedout/pr-36386 
Pr 36386
 2016-09-17 20:54:37 +09:00
Mike Place
f5d63d93cc
Lint 2016-09-17 20:53:41 +09:00
Mike Place
8b7cfa0a5b Merge pull request #36281 from kraney/boto_elasticsearch 
Add support for ElasticsearchVersion parameter
 2016-09-17 19:47:00 +09:00
Mike Place
28fd227ea1 Merge pull request #36250 from UtahDave/fix_set_computer_name 
fix logic problem that prevented name change
 2016-09-17 19:45:01 +09:00
Mike Place
0d94d2e29f Merge pull request #36251 from bailsman/boto_rds_none_parameters 
boto3 doesn't want parameters to be None
 2016-09-17 19:44:28 +09:00
Mike Place
4e40a4f6b1 Merge pull request #36351 from jtand/freebsd_test_fix 
Close open socket on freebsd
 2016-09-17 19:07:39 +09:00
Mike Place
6b9f0f1ac0 Merge pull request #36370 from rallytime/add-versions-report-shortcut 
Add -V option to work with --versions-report
 2016-09-17 19:06:37 +09:00
Mike Place
c0dffdf3c8 Merge pull request #36387 from sjmh/fix/minion_cache_publish 
Fix/minion cache publish
 2016-09-17 18:18:04 +09:00
Steve Hajducko
67521917c4 Create a set from the minion list 2016-09-16 19:06:36 -07:00
Steve Hajducko
7fb1dba182 Skip extra traversals of minion cache for auth 
With a large amount of minions and large ACL sets, check_minions starts
to become rather expensive.  The master's publish was already obtaining
this list ( albeit later in execution ), but by moving it up and passing
it to CkMinion's auth_check, it allows CkMinion's validate_tgt to skip a
cache traversal. Related to #33948
 2016-09-16 19:06:36 -07:00
xiaoanyunfei
93269cfb65 fix salt-api log and pid 2016-09-17 09:53:16 +08:00
Winston Liu
86d632264c return error on delete usage plan if we had problems describing the plan_id. 2016-09-16 16:03:37 -07:00
Winston Liu
9093c8c004 fixed validation for throttle/quota. 2016-09-16 15:56:58 -07:00
Nicole Thomas
dd8c82ac5b Be explicit about importing salt.utils.decorators (#36383) 
This is possibly causing problems with one of the dockerng unit tests
on Ubuntu 12. Being explicit the use of identical_signature_wrapper
may help clear up some of the mocking problems with backports and
docker.

I also changed the sys.version_info option to use the six.PY2 global.
This is more consistent with other salt files and essentially does the
same thing and avoids an additional import.
 2016-09-16 16:30:07 -06:00
Nicole Thomas
2f16e43d67 Update the extend.py and extend_test.py imports (#36382) 
When using `fopen`, we need to import all of salt.utils. We should
also be explicit about calling salt.utils.fopen.

This also cleans up the ordering of the salttesting vs salt libs to
be consistent with other files and conform with `ensure_is_syspath`.

Also changes a print statement to a log.info
 2016-09-16 16:26:13 -06:00
Nicole Thomas
73ee12eff7 Merge pull request #36377 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-16 16:04:53 -06:00
rallytime
93d34af667 Merge branch 'carbon' into 'develop' 
Conflicts:
  - tests/unit/utils/schema_test.py
 2016-09-16 14:38:10 -06:00