Commit Graph

5479 Commits

Author SHA1 Message Date
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
Mike Place
bbc6f84c75 Merge pull request #26105 from cachedout/fix_25221
Fix failing test
2015-08-07 12:11:10 -06:00
Mike Place
1a18013330 Fix failing test 2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6 Merge pull request #25221 from jet9/istextfile_utf8
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
2015-08-07 12:10:27 -06:00
Mike Place
41fc026cff Merge pull request #26072 from QuinnyPig/update-rvm
Updated rvm installer script link as per upstream
2015-08-07 08:56:19 -06:00
Mike Place
11fa9c3cc2 Merge pull request #26085 from rallytime/one-tests
Added more unit tests to OpenNebula driver
2015-08-07 08:33:11 -06:00
Dmitry Kurbatov
2a349ff102 Extend salt.utils.istextfile() with utf-8 instead of binary detection 2015-08-07 10:06:20 +03:00
rallytime
a639c28050 Added more unit tests to OpenNebula driver
Also fixed some minor bugs found along the way.
2015-08-06 17:22:51 -06:00
Corey Quinn
d5cb70360f Fixed to expanded URL 2015-08-06 13:14:39 -07:00
Corey Quinn
e4f78637a0 Updated rvm installer script link as per upstream 2015-08-06 11:47:30 -07:00
Justin Findlay
6c6f407f66 Merge pull request #26050 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-08-06 11:03:54 -06:00
rallytime
3811332a80 Add more OpenNebula unit tests 2015-08-05 16:42:14 -06:00
Colton Myers
d332d54eec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-08-05 15:32:11 -06:00
rallytime
1b5a9bc91d Pylint fix 2015-08-05 10:05:29 -06:00
rallytime
78ea0f246e Started writing unit tests for OpenNebula driver
Also fixed up some inconsistencies and bugs found along the way
2015-08-04 16:45:09 -06:00
Mike Place
85f5e2a443 Fix failing tests 2015-08-04 09:48:43 -06:00
Mike Place
662962c196 Merge pull request #25981 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-08-04 09:28:15 -06:00
Dmitry Kuzmenko
5c6276ac7d Subscribe event to bus is optional now
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-08-03 16:10:38 -06:00
Colton Myers
d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/fileserver/s3fs.py
    salt/modules/chocolatey.py
    salt/modules/s3.py
    salt/modules/zpool.py
    salt/pillar/s3.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
Pedro Algarvio
37924b2843 Shutdown the multiprocessing logging queue listener 2015-08-03 21:37:56 +01:00
Colton Myers
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -06:00
Colton Myers
abf389743a Merge pull request #25903 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-08-03 11:12:18 -06:00
Mike Place
986935cc9f Merge pull request #25950 from s0undt3ch/features/raas-5-salt-ssh
A more graceful salt-master exit + Multiprocessing logging
2015-08-03 09:20:56 -06:00
Pedro Algarvio
8f3199f933 Make sure the mp logging queue listener is configured 2015-08-03 13:20:08 +01:00
Pedro Algarvio
05165467e8 Allow schemas to override it's class attribute name 2015-07-31 22:42:43 +01:00
Pedro Algarvio
55918b7d50 Allow schema items to override it's class attribute name 2015-07-31 21:00:22 +01:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Thomas Jackson
fb4cdc475f Keep track of SyncWrapper's IOLoop usage
While thinking through issues that might cause #25718 I ran into this case-- where you can create 2 sync wrappers with the same parent IOLoop and run into problems because you can't start/stop the loop multiple times like that and have the call tree work correctly. To solve this (since it *should* be the exceptional case) I'm making SyncWrapper keep track of which loops are in use-- then if someone attempts this situation it will simply make another one.
2015-07-29 08:48:33 -07:00
Dmitry Kuzmenko
bf9dd00aac Subscribe event to bus is optional now
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-07-29 17:44:02 +03:00
Mike Place
fefb4eb79b Merge pull request #25767 from techhat/awskms
Add AWS KMS support to S3
2015-07-28 10:00:41 -06:00
Mike Place
ada3a29e55 Fix broken test for file.copy 2015-07-28 09:57:49 -06:00
Pedro Algarvio
df5aaeef61 Merge pull request #25772 from s0undt3ch/features/raas-5-salt-ssh
Salt-SSH Py3 thin & Config schema
2015-07-28 16:39:20 +01:00
Thomas S Hatch
f4a3583595 Merge pull request #25762 from jfindlay/etcd
Fix #24959 unit tests
2015-07-28 09:32:24 -06:00
Thomas S Hatch
1fae76d53c Merge pull request #25685 from twangboy/fix_25594
Fixed regex issues with comment and uncomment
2015-07-28 09:29:49 -06:00
Pedro Algarvio
359348ba1c Fix SSH Roster Schema unittests 2015-07-28 12:37:19 +01:00
Pedro Algarvio
034353040c Make the tests discoverable 2015-07-28 12:23:18 +01:00
Pedro Algarvio
c7b5fccb9e Change cwd back to Salt's code dir 2015-07-28 12:22:53 +01:00
Pedro Algarvio
e7681f7c75 Try to overcome a failure to get cwd in Cent tests 2015-07-28 12:07:04 +01:00
Pedro Algarvio
d649252878 Fix class reference 2015-07-28 10:33:08 +01:00
Pedro Algarvio
10c47647e3 Also rename the test module 2015-07-28 10:33:08 +01:00
Joseph Hall
37ff73d935 Update tests 2015-07-27 18:56:55 -06:00
Pedro Algarvio
143e8fa200 Let's call it for what it is! 2015-07-28 00:42:55 +01:00
Pedro Algarvio
63cecaddf4 Implement the Roster config schema 2015-07-28 00:42:55 +01:00
Pedro Algarvio
eabc84d93c Implemented RosterEntryConfig and added unit tests for it 2015-07-28 00:42:55 +01:00
Pedro Algarvio
ddf814174e Rename the config unit tests module 2015-07-28 00:42:54 +01:00
twangboy
a904e8329b Fixed another test failure... 2015-07-27 15:05:23 -06:00
Justin Findlay
de344e465c fix etcd_mod unit tests 2015-07-27 14:13:34 -06:00
Justin Findlay
b3bed2d5d2 Merge pull request #25754 from s0undt3ch/develop
Merge 2015.8 forward to develop
2015-07-27 13:34:56 -06:00
David Boucha
f05ae95f9c Merge pull request #25648 from twangboy/fix_25352
Clarified functionality of reg module, fixed state to work with new module
2015-07-27 13:30:33 -06:00