valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,481 Commits 24 Branches 182 Tags 341 MiB
df5f934c34
Commit Graph

70481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
f3e84c1ab7 Update pyobjects test to be a list 
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
 2017-01-18 12:16:30 -07:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
Mike Place
1033bbdde8 Merge pull request #38808 from vutny/fix-38388 
Fix #38388
 2017-01-18 11:19:35 -07:00
twangboy
7ca3fd7484 Fix get_hostname to handle longer computer names 2017-01-18 11:19:22 -07:00
Mike Place
f3ae3cd5c8 Merge pull request #38668 from terminalmage/issue38604 
Fix proposal for #38604
 2017-01-18 10:53:08 -07:00
Denys Havrysh
9bd203ffcc Fix #38388 
If `log_level_logfile` is not set explicitly it should inherit the
level set by `log_level` configuration option.
 2017-01-18 19:16:38 +02:00
Mike Place
c6a19a9e5a Merge pull request #38789 from rallytime/fix-38622 
Update some saltenv refs to environment in salt.modules.state docs
 2017-01-18 08:39:21 -07:00
Mike Place
e0bf700020 Merge pull request #38790 from cachedout/fix_pyobjects_test_typo 
Fix typo in pyobjects test
 2017-01-18 08:38:56 -07:00
Mike Place
6e9785edea Merge pull request #38792 from rallytime/fix-38629 
Update pillar tutorial lanuage regarding pillar_opts settings
 2017-01-18 08:38:18 -07:00
Alexandru Bleotu
97521b3468 Second attempt to fix prepending of root_dir to paths 2017-01-18 11:37:22 +00:00
Mike Place
3417adc617 Merge pull request #38796 from saltstack/revert-38707-root_dir_fix-gh 
Revert "Fixed prepending of root_dir override to the other paths"
 2017-01-17 16:18:17 -07:00
Mike Place
cb080f3bbe Revert "Fixed prepending of root_dir override to the other paths" 2017-01-17 16:17:41 -07:00
Erik Johnson
0ea97cdad9 Merge pull request #10 from cachedout/pr-38668 
Munge retcode into return data for batching
 2017-01-17 17:10:20 -06:00
rallytime
1e125e2844 Update pillar tutorial lanuage regarding pillar_opts settings 
The pillar_opts option defaults to ``False``. This change updates
the language in the pillar tutoral to be in-line with the default
setting.

Fixes #38629
 2017-01-17 14:55:17 -07:00
Frederic Boismenu
624f25b78d Fix for #38697 2017-01-17 16:51:07 -05:00
Mike Place
a66afb5f0f
Fix typo in pyobjects test 2017-01-17 13:57:20 -07:00
rallytime
af41fe0c6e Update some saltenv refs to environment in salt.modules.state docs 
If saltenv is not specified in some of these functions, the the
"environment" option is used instead.

Fixes #38622
 2017-01-17 12:17:00 -07:00
Mike Place
bab3479a3c Merge pull request #38585 from rallytime/follow-up-38527 
Follow up to PR #38527
 2017-01-17 11:40:01 -07:00
Mike Place
db81afc035
Munge retcode into return data for batching 2017-01-17 11:31:45 -07:00
rallytime
05587201b6 Pylint fix: add line at end of file 2017-01-17 10:26:43 -07:00
Mike Place
0fb6bb7b77 Merge pull request #38707 from alexbleotu/root_dir_fix-gh 
Fixed prepending of root_dir override to the other paths
 2017-01-17 08:40:12 -07:00
Mike Place
96c9dc10f7 Merge pull request #38774 from vutny/dev-test-docs 
DOCS: add C++ compiler installation on RHEL required for bundled 0mq
 2017-01-17 08:20:59 -07:00
Denys Havrysh
4620dc4afa DOCS: add C++ compiler installation on RHEL required for bundled 0mq 2017-01-17 15:02:31 +02:00
Mike Place
aedfbb7a43 Merge pull request #38749 from vutny/pkg-build-better-exception-msg 
pkg build modules throw better exception message if keyid wasn't found
 2017-01-16 19:13:08 -07:00
Nicole Thomas
8466b34e82 Merge pull request #38743 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-01-16 18:46:00 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
Mike Place
a642cdef79 Merge pull request #38723 from rallytime/fix-38674 
Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py
 2017-01-15 11:36:13 -07:00
Denys Havrysh
53f2be5b21 pkg build modules throw better exception message if keyid wasn't found 2017-01-15 20:05:32 +02:00
Mike Place
fc545af10b Merge pull request #38669 from rallytime/update-bootstrap-script 
Update bootstrap script verstion to latest release
 2017-01-15 11:03:26 -07:00
Mike Place
50d417f267 Merge pull request #38693 from twangboy/update_jinja 
Update jinja2 to 2.9.4
 2017-01-15 07:40:45 -07:00
Mike Place
f4233bb18d Merge pull request #38739 from vutny/fix-runtests-doc 
DOCS: correct examples of running test suite
 2017-01-15 07:35:47 -07:00
Denys Havrysh
b872bb63f6 DOCS: correct examples of running test suite 2017-01-15 11:48:04 +02:00
Denys Havrysh
51d4707071 DOCS: add links to File State Backups page where necessary (#38735) 2017-01-14 11:49:21 -07:00
Nicole Thomas
6869621ed1 Merge pull request #38731 from rallytime/merge-2015.8 
Various follow up fixes
 2017-01-14 11:46:46 -07:00
rallytime
9eb191b6ac Pylint fix 2017-01-13 16:56:00 -07:00
Sébastien Santoro
6d3717b9ee Proofread jinja_to_execution_module tutorial (#38720) 2017-01-13 14:53:50 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -07:00
rallytime
706c885f55 Remove "event_publisher_pub_hwm" and "salt_event_pub_hwm" from config/__init__.py 
These options were used back when the event system was based on ZMQ. As of PR
PR #29294, these options are no longer needed and are obsolete. PR #29294 changed
the event system transport from ZMQ to TCP/tornado.

There are no other mentions of these configuration options in the salt code base
except in the man pages. Once the man pages are regenerated, those references will
be removed.

Fixes #38674
 2017-01-13 08:47:22 -07:00
Alexandru Bleotu
0bac8c8be3 Fixed prepending of root_dir override to the other paths 2017-01-12 12:46:17 +00:00
twangboy
e0c7e5549b Update jinja2 to 2.9.4 2017-01-11 11:10:46 -07:00
rallytime
fa01367599 Keep a copy of the DEFAULT_API_OPTS and restore them after the test run 
Without this copy, the settings in DEFAULT_API_OPTS was getting overridden
by the new settings in the unit test. Let's copy those default settings,
and then restore them at the end of the test. These tests have also been
marked as destructive.
 2017-01-11 10:35:55 -07:00
rallytime
78ba76e34c Update bootstrap script verstion to latest release 
Version 2017.01.10
 2017-01-10 14:55:30 -07:00
Erik Johnson
a642a995dc Return the ret data from batch execution instead of raw data 
Fixes #38604
 2017-01-10 15:20:55 -06:00
rallytime
2ad07634d9 Test clean up 2017-01-10 11:35:48 -07:00
Mike Place
7b850d472d Merge pull request #38647 from gtmanfred/nova 
Allow novaclient to use keystoneauth1 sessions for authentication
 2017-01-10 10:48:25 -07:00
Mike Place
383768d838 Merge pull request #38650 from rallytime/remove-ubuntu-ppa-docs 
Remove the installation instructions for out-of-date community ppa
 2017-01-10 10:47:45 -07:00
Mike Place
7d9f56e3b5 Merge pull request #38657 from DSRCorporation/bugs/38087_syndic_event_format_fix 
Publish the 'data' field content for Syndic evets
 2017-01-10 09:59:33 -07:00
Mike Place
83987511fd Merge pull request #38649 from Ch3LL/test_apply_template 
fix unit.modules.file_test
 2017-01-10 09:44:45 -07:00
Dmitry Kuzmenko
594c33f396 Publish the 'data' field content for Syndic evets 
instead of the entire event.
 2017-01-10 17:22:01 +03:00
rallytime
30429b2e44 Remove the installation instructions for out-of-date community ppa 
These packages are not being updated and it is causing confusion.

Ubuntu packages should be installed with the instructions on
repo.saltstack.com.
 2017-01-09 17:13:50 -07:00