valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
52,221 Commits 24 Branches 182 Tags 341 MiB
f044678db9
Commit Graph

52221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f044678db9 Merge pull request #23197 from nmadhok/vmware-cloud-driver 
VMware cloud driver additions
 2015-04-30 08:22:51 -07:00
Thomas S Hatch
46b7938d54 Merge pull request #23178 from jfindlay/boto_version 
fix incorrect boto_vpc state versionaddeds
 2015-04-30 08:22:25 -07:00
Mike Place
d5a326ba63 Merge pull request #23203 from tsaridas/boto_iam_fix 
Boto iam fix
 2015-04-30 09:22:11 -06:00
Thomas S Hatch
4fabf465ff Merge pull request #23174 from jfindlay/locale_utils 
move locale utils to separate module
 2015-04-30 08:22:00 -07:00
Thomas S Hatch
fd6448ab94 Merge pull request #23171 from skizunov/develop 
Bugfix: 'clean_proc_dir' is broken
 2015-04-30 08:21:32 -07:00
Thomas S Hatch
6c511beca1 Merge pull request #23219 from joehealy/debian_remove_debian_dir 
Removed debian dir as only likely to cause confusion.
 2015-04-30 08:20:41 -07:00
Thomas S Hatch
5f75b87224 Merge pull request #23217 from ykomatsu/http 
Fix wrong namespaces
 2015-04-30 08:20:08 -07:00
Thomas S Hatch
31de5b5932 Merge pull request #23216 from joehealy/debian_doc_update 
Clean up of docs following jessie
 2015-04-30 08:15:29 -07:00
Thomas S Hatch
48bdbedf83 Merge pull request #23212 from alexandrsushko/fix-23210 
Fix for grain virtual in lxc-libvirt
 2015-04-30 08:15:19 -07:00
Joe Healy
d4a41a7d6a Removed debian dir as only likely to cause confusion. 
This was only working properly on lucid and lucid has now
reached eol. Other releases of debian/ubuntu are best packaged
from the packaging repo at http://anonscm.debian.org/cgit/pkg-salt/salt.git
 2015-04-30 23:56:06 +10:00
Joe Healy
f791a2c1e6 Clean up of docs following jessie 2015-04-30 23:48:32 +10:00
Yoshito Komatsu
48cc60b11c Fix wrong namespaces 2015-04-30 22:37:06 +09:00
Alexandr Sushko
55b0663e53 Fix for grain virtual in lxc-libvirt 
Fixes #23210
Fixes #15846
 2015-04-30 13:31:24 +03:00
Nitin Madhok
edcef7dd26 Auto retrieve the host system's SSL thumbprint 2015-04-30 05:12:17 -04:00
Andrea-Redi Tsarida
b931da86ab Fix for case that group is not present and we want to add users. 2015-04-30 11:05:01 +02:00
Andrea-Redi Tsarida
8f19b765ba Test mode for : 
- rds replica_present
- elb register_instances
 2015-04-30 10:57:55 +02:00
Nitin Madhok
0a08e4eed0 Lint 2015-04-30 01:15:29 -04:00
Nitin Madhok
3a1186b07a Adding connect_host() and disconnect_host() to be able to connect and disconnect the host system 2015-04-30 01:13:44 -04:00
Nitin Madhok
48d58c5688 Lint 2015-04-30 00:51:11 -04:00
Nitin Madhok
651992331c Adding remove_host() to be able to remove a host from the vcenter 2015-04-30 00:49:04 -04:00
Nitin Madhok
f14a52c2b9 Adding add_host() to be able to add a host to a cluster or a datacenter 2015-04-29 23:33:28 -04:00
Joseph Hall
c369bc1a74 Merge pull request #23189 from mattrobenolt/softlayer 
softlayer shouldn't try and use libcloud's script function
 2015-04-29 19:54:44 -06:00
Matt Robenolt
22bfb3079b softlayer shouldn't try and use libcloud's script function 2015-04-29 15:22:30 -07:00
Justin Findlay
f46db2c8cb move locale specifier utilities to utils/locales 2015-04-29 16:00:45 -06:00
Justin Findlay
0a11908da8 Merge pull request #23175 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-29 15:54:32 -06:00
Justin Findlay
e8792c735c move locale utils to utils.locales 2015-04-29 15:11:32 -06:00
Colton Myers
10b7574b64 Merge pull request #15 from jfindlay/dev_test 
merge forward lint and test fixes
 2015-04-29 15:10:43 -06:00
Justin Findlay
d935b996e7 fix cmd_test for develop branch 2015-04-29 15:00:56 -06:00
Justin Findlay
e385085339 Merge pull request #23182 from jtand/qingcloud_pylint 
Fixed a pylint error in qingcloud.py
 2015-04-29 14:47:06 -06:00
Justin Findlay
f6eb08be15 fix develop py-2.6 lint 2015-04-29 14:35:25 -06:00
Justin
0ebe284064 Fixed a pylint error in qingcloud.py 2015-04-29 13:41:05 -06:00
Justin Findlay
8064483f85 fix incorrect boto_vpc state versionaddeds 
Fixes #23162.
 2015-04-29 12:45:26 -06:00
Colton Myers
cca8ddc886 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    .testing.pylintrc
    salt/auth/pam.py
    salt/modules/win_status.py
    salt/utils/network.py
    salt/utils/schedule.py
    tests/unit/renderers/gpg_test.py
    tests/unit/states/boto_secgroup.py
 2015-04-29 12:01:52 -06:00
Justin Findlay
2be92b984c remove extemporaneous file tmp 2015-04-29 11:41:32 -06:00
Sergey Kizunov
5b2a80e010 Bugfix: 'clean_proc_dir' is broken 
Upon testing (in my Windows environment), I noticed that in
clean_proc_dir():
    job = salt.payload.Serial(opts).load(fp_)

The result would always be that 'job' is None. Upon further
investigation, this seems to be the case because of this line above:
    job_data = fp_.read()

If I remove that line, things work as expected. So it seems like the
'fp_.read()' will move the current file position of 'fp_' to the end,
and so 'salt.payload.Serial(opts).load(fp_)' would end up reading what
it thinks is an empty file.

Looking at the logic, it seems like 'job_data = fp_.read()' is an
unnecessary step in any case, so it has been removed.

I have noticed that this same incorrect logic also exists in the 2015.2
and 2014.7 branches.

Also, added a fix for deleting files on Windows which was already in
another part of the same function.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-04-29 11:22:05 -05:00
Justin Findlay
afc192405c Merge pull request #23149 from whiteinge/doc-reactor-render-logs 
Added note about debugging reactor files to see the rendered output
 2015-04-29 10:21:49 -06:00
Justin Findlay
ee91670a7f Merge pull request #23170 from DSRCompany/readd_zmq_monitor 
#22595 Re-add ZMQ Monitor socket
 2015-04-29 10:19:26 -06:00
Justin Findlay
bdd5f8f878 Merge pull request #23163 from ckochenower/develop 
Do not convert Cassandra collections (set, list, map) to strings.
 2015-04-29 10:18:31 -06:00
Justin Findlay
68391e3198 Merge pull request #23152 from mgwilliams/boto_vpc 
Separate subnet_ids and subnet_names in boto_vpc.route_table_present
 2015-04-29 09:32:08 -06:00
Dmitry Kuzmenko
0b7a13aa63 Re-add ZMQ Monitor socket 2015-04-29 18:25:12 +03:00
Justin Findlay
114c29fe7a Merge pull request #23160 from ykomatsu/brew 
Do not use runas when user is correct
 2015-04-29 09:20:48 -06:00
Justin Findlay
2ad2840936 Merge pull request #23169 from jayeshka/rh_ip-unit-test 
adding rh_ip unit test case
 2015-04-29 09:20:19 -06:00
Justin Findlay
9e474a2946 Merge pull request #23168 from jayeshka/cmd-states-unit-test 
adding states/cmd unit test case
 2015-04-29 09:19:10 -06:00
Yoshito Komatsu
42ef698790 Fix typos 2015-04-29 21:40:31 +09:00
Yoshito Komatsu
1bda5365dd Fix tests 2015-04-29 21:37:59 +09:00
Yoshito Komatsu
44b06f4db6 Use _call_brew 2015-04-29 21:24:20 +09:00
Jayesh Kariya
526383deaa adding states/cmd unit test case 2015-04-29 17:31:23 +05:30
Jayesh Kariya
636c654205 adding rh_ip unit test case 2015-04-29 17:29:37 +05:30
Corin Kochenower
9dd71f47a7 Do not convert Cassandra set, list, maps to strings 
Cassandra supports set, list, and map collection datatypes.
Do not convert these structures to a string when returning
data from queries.
 2015-04-29 05:58:28 +00:00
Corin Kochenower
b2d9189c9b Merge branch 'develop' of http://github.com/ckochenower/salt into develop 
Conflicts:
	salt/returners/cassandra_cql_return.py
 2015-04-29 05:51:46 +00:00