Commit Graph

57035 Commits

Author SHA1 Message Date
Mike Place
737fb1410c Merge pull request #25796 from cachedout/debug_doc
Remove debug from docs
2015-07-28 11:35:58 -06:00
Mike Place
33bfdf3b0b Remove debug from docs 2015-07-28 11:35:32 -06:00
Florian Ermisch
ec0d17de3d fix W1699(incompatible-py3-code) 2015-07-28 18:53:39 +02:00
Florian Ermisch
04f8980a61 fix returning changed visibility 2015-07-28 18:43:56 +02:00
Pedro Algarvio
97337823d9 Enforce a minimum of python 2.6 on thin creation 2015-07-28 17:10:35 +01:00
Florian Ermisch
ddd06c4724 up until Boron wrap result in a dict 2015-07-28 18:09:08 +02:00
Florian Ermisch
f4249e7399 return changes on visibility 2015-07-28 18:08:15 +02:00
Jorge Schrauwen
937779eb51 patchelf lives in pkgsrc
alteast on base-64-lts 14.4.0 release
2015-07-28 10:03:20 -06:00
Mike Place
a658753eff Merge pull request #25749 from jahamn/fix-zpool-special-char-device-support
Allow zpool.create on character devices
2015-07-28 10:01:40 -06:00
Bruno Clermont
0aa1416b6b Don't acquire lock if there is no formatter
this cause locking when a log handler don't have a formatter (because it don't need one)
2015-07-28 10:01:34 -06: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
dd34859cd1 Merge pull request #25791 from cachedout/fix_test_25771
Fix broken test for file.copy
2015-07-28 09:58:22 -06:00
Mike Place
ada3a29e55 Fix broken test for file.copy 2015-07-28 09:57:49 -06:00
Mike Place
3297fb82ed Merge pull request #25771 from puneetk/patch-2
Update file.py
2015-07-28 09:56:50 -06:00
Mike Place
e206299e7b Merge pull request #25743 from garethgreenaway/add_status_time
Adding status.time
2015-07-28 09:53:54 -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
20d4fbdd64 Merge pull request #25759 from rallytime/one-getting-started
Added Getting Started with OpenNebula docs
2015-07-28 09:32:06 -06:00
Thomas S Hatch
b4418fddb4 Merge pull request #25688 from bclermont/patch-1
Don't acquire lock if there is no formatter
2015-07-28 09:31:36 -06:00
Thomas S Hatch
0e105e3bb0 Merge pull request #25634 from iamseth/add-zenoss-module
Add zenoss state and execution modules
2015-07-28 09:30:45 -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
Thomas S Hatch
0bdb29402a Merge pull request #25763 from twangboy/fix_25437
Fix 25437
2015-07-28 09:29:27 -06:00
Florian Ermisch
a0dad3b845 image_present: if len(acceptable) drops to 0 we've got a problem... 2015-07-28 17:29:22 +02:00
Florian Ermisch
763189c459 cherry-picking some clean-up 2015-07-28 17:21:57 +02:00
Florian Ermisch
fa219d3c84 import of prototype of image_update() from lithium branch glance_state_module 2015-07-28 17:17:51 +02:00
Florian Ermisch
2e7b154a5c Catch HTTPForbidden and return an Error 2015-07-28 17:00:59 +02:00
Florian Ermisch
73ba331f1f Refresh image details if active but w/o checksum 2015-07-28 16:48:50 +02:00
Akhter
d3be3d54fb added the missing declaration of eload and status 2015-07-28 10:37:15 -04:00
Pavel
7f673dc4dc fixing faulty command-line defaults check in utils.parser [2] 2015-07-28 17:33:29 +03:00
Florian Ermisch
a6d7d3f5ce Add missing parameter "protected" to image_create 2015-07-28 16:15:16 +02:00
Pavel
b4fcbb2524 fixing faulty command-line defaults check in utils.parser 2015-07-28 17:08:33 +03:00
Daniel Hobley
41cca282b3 Catch a hard crash when running highstate on windows
- Workaround for issue #24002
2015-07-28 15:55:58 +02:00
Florian Ermisch
0b89931376 image_list:check saltversion to determine behavior
I'm not supposed to do this, am I?
2015-07-28 14:42:22 +02:00
Florian Ermisch
e54ef56c24 build ret{} with matching images
doesn't work with multiple images of the same
name b/c ret is keyed with the images' names!
2015-07-28 13:50:28 +02: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
Florian Ermisch
5350baa8e5 Catch HTTPNotFound and return error 2015-07-28 13:14:58 +02:00
Pedro Algarvio
e7681f7c75 Try to overcome a failure to get cwd in Cent tests 2015-07-28 12:07:04 +01:00
Florian Ermisch
95db1d603a added option "test" - not yet well tested :D 2015-07-28 12:51:50 +02:00
Florian Ermisch
076f20cbbe Add optional parameter "name"
As states are identified by names and not random
IDs we don't want to have to check for a not-yet-
known value.
2015-07-28 12:47:38 +02:00
Pedro Algarvio
d649252878 Fix class reference 2015-07-28 10:33:08 +01:00
Pedro Algarvio
fcef605a4a Remove unused imports 2015-07-28 10:33:08 +01:00
Pedro Algarvio
4faf2248cd Comment typo 2015-07-28 10:33:08 +01:00
Pedro Algarvio
e1d5bd6ecd Allow passing JID to a salt-ssh execution 2015-07-28 10:33:08 +01:00
Pedro Algarvio
10c47647e3 Also rename the test module 2015-07-28 10:33:08 +01:00
Pedro Algarvio
08692b6cfc Indentation fixes 2015-07-28 10:33:08 +01:00
Andreas Lutro
4ce0606a31 iptables.build_rule - rule is a list, not a string 2015-07-28 10:07:45 +02:00
Nicole Thomas
13c2377e95 Merge pull request #25764 from gtmanfred/2015.8
allow use of cloudnetworks in ssh_interface
2015-07-27 20:40:06 -06:00
Seth House
c1236595f9 Merge pull request #25752 from thatch45/state_top_saltenv
State top saltenv
2015-07-27 19:02:10 -06:00