C. R. Oldham
bffc537aca
Remove extra if statements (rstrip will check for the presence anyway).
2017-02-01 09:40:45 -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
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
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
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
rallytime
fd2ee7db30
Add some simple unit tests for salt.config.api_config function
...
This will help prevent regressions in this area as discussed in
PR #38527 .
2017-01-09 16:44:48 -07:00
rallytime
3d2fefc83b
Make sure the pidfile and log_file values are overriden by api opts
2017-01-09 16:09:03 -07:00
Ch3LL
47f8b68e0b
fix unit.modules.file_test
2017-01-09 15:01:52 -07:00
rallytime
e8309a6bbf
Add release notes for 2015.8.13
2017-01-09 14:25:31 -07:00
Nicole Thomas
f881f366b7
Merge pull request #20 from rallytime/2015.8.12_follow_up-batch-tests
...
Clean up tests and docs for batch execution
2017-01-09 13:55:26 -07:00
Daniel Wallace
5be9b60851
add documentation about using keystoneauth for v3
2017-01-09 14:07:25 -06:00
rallytime
34282322c0
Clean up tests and docs for batch execution
...
Batch execution was removed from NetapiClient and Saltnado in
previous commits. This change is a follow up that removes related
test cases and doc references.
2017-01-09 11:29:34 -07:00
Nicole Thomas
c80b20b957
Merge pull request #19 from whiteinge/batchclient
...
Remove batch execution from NetapiClient and Saltnado
2017-01-06 16:38:54 -05:00
Seth House
3d8f3d18f6
Remove batch execution from NetapiClient and Saltnado
...
To be restored once batch execution can support eauth.
2017-01-06 14:34:07 -07:00
Mike Place
74ddc71be3
Merge pull request #38626 from saltstack/revert-37358-2016.3.3_issue37355
...
Revert "Fix/workaround for issue #37355 "
2017-01-06 14:28:08 -07:00
Mike Place
e912ac99c2
Revert "Fix/workaround for issue #37355 "
2017-01-06 14:27:57 -07:00
Bo Maryniuk
97b0f64923
Lintfix
2017-01-06 15:29:57 -05:00
Bo Maryniuk
d1516664f7
Add explanation comment
2017-01-06 15:29:51 -05:00
Bo Maryniuk
62f2c87080
Add docstring
2017-01-06 15:29:45 -05:00
Bo Maryniuk
9b0a786aeb
Explain what it is about and how to configure that
2017-01-06 15:29:25 -05:00
