Commit Graph

38156 Commits

Author SHA1 Message Date
Joseph Hall
b255451078 Merge pull request #16538 from anitakrueger/add-feature-hipchat
New module and state for HipChat
2014-10-11 20:35:48 -06:00
Erik Johnson
713f3ecc73 Spelling fixes 2014-10-11 20:13:45 -05:00
Erik Johnson
2ab643691f Merge branch 'aboe76-suse_rpm_spec' into develop 2014-10-11 20:12:50 -05:00
Erik Johnson
1837a303c8 Merge branch 'suse_rpm_spec' of https://github.com/aboe76/salt into aboe76-suse_rpm_spec 2014-10-11 20:12:35 -05:00
Seth House
3018c75a91 Merge pull request #16535 from UtahDave/slack_notify
add slack notification module
2014-10-11 19:00:39 -06:00
Joseph Hall
e6653f5a87 Merge pull request #16578 from stephen-mw/fix-small-typo
Fix minor typos.
2014-10-11 18:21:00 -06:00
David Boucha
1f069e1887 pylint didn't like the backslash in CLI command 2014-10-11 18:09:01 -06:00
David Boucha
58ce101261 correct module name to pyslack.
Remove git install instructions
2014-10-11 18:08:25 -06:00
David Boucha
55caef9f37 add slack notification module 2014-10-11 18:08:25 -06:00
Stephen Wood
1be08146c8 Fix minor typos. 2014-10-11 17:03:38 -07:00
Niels Abspoel
5fd3ef480f updated salt.spec file for suse:
this fixes #16560
2014-10-11 20:29:52 +02:00
Joseph Hall
d89bf55ad5 Merge pull request #16576 from Whissi/fix_not-found_build_msg
Add missing docstring for templates directory
2014-10-11 09:23:05 -06:00
Anita Krueger
aaca3c8e91 Added docstring, added CLI examples, removed dunder variables 2014-10-11 15:09:13 +01:00
Thomas D
bb4a14dc81 Add missing docstring for templates directory
This fixes the following build error message:

  package init file 'salt/templates/__init__.py' not found (or not a regular file)
2014-10-11 15:41:12 +02:00
Anita Krueger
31c4e544a9 Rewrite of the hipchat module to use requests instead of urllib and support for HipChat api version 2 2014-10-11 13:17:00 +01:00
Nicole Thomas
76d2be5257 Merge pull request #16549 from garethgreenaway/mount_module_fix
Fix to mount module
2014-10-10 17:34:18 -06:00
Nicole Thomas
d5c4de6e93 Merge pull request #16559 from rallytime/fix_develop_tests
Clean up boto_secgroup unit test
2014-10-10 17:29:57 -06:00
rallytime
e15bf67fba Clean up boto_secgroup unit test
This test required some tweaks as there are new versions of boto and moto
2014-10-10 16:03:21 -06:00
Joseph Hall
faa0fe33f2 Merge pull request #16545 from steverweber/cloud_vsphere_list_nodes
vsphere improve preformance of list_nodes
2014-10-10 13:05:13 -06:00
Samuel Smith
4a92aa232f Merge pull request #16552 from SmithSamuelM/sam_dev1
Added preliminary support for multiple master in Raet
2014-10-10 12:38:48 -06:00
Samuel M Smith
5ba50aa010 Merge remote-tracking branch 'upstream/develop' into sam_dev1 2014-10-10 12:32:19 -06:00
Samuel M Smith
8d513b8fe2 Modified RoadStack setup behavior to accept new syntax for multiple raet masters
Attempts to join. Need to test behavior with multiple masters
2014-10-10 12:27:49 -06:00
Samuel M Smith
0a84db1917 Updated test 2014-10-10 12:26:48 -06:00
Gareth J. Greenaway
bb75aab1a8 fix to umount function in the mount module, device should not be a required argument. 2014-10-10 10:52:21 -07:00
Joseph Hall
f0de5cdb79 Merge pull request #16543 from steverweber/cloud_vsphere_list_vm_fast
cloud vsphere - get list of vm names fast
2014-10-10 11:44:15 -06:00
Steve Weber
70d7d79a3d lint 2014-10-10 13:34:10 -04:00
Steve Weber
7836521c69 more direct and faster 2014-10-10 13:32:12 -04:00
Samuel Smith
91f332622c Merge pull request #16547 from SmithSamuelM/sam_dev1
Fixed lint errors also fixed typo
2014-10-10 11:22:02 -06:00
Samuel M Smith
06549135ac Merge remote-tracking branch 'upstream/develop' into sam_dev1 2014-10-10 11:19:13 -06:00
Samuel M Smith
476875c562 Fixed pylint errors 2014-10-10 11:18:36 -06:00
Samuel M Smith
2ea41ed1a1 Fixed typo in ValueError format string 2014-10-10 11:18:03 -06:00
Steve Weber
7e4ba959b9 lint 2014-10-10 12:36:15 -04:00
Steve Weber
c47ffd9daf lint 2014-10-10 12:35:02 -04:00
Steve Weber
b0a3116bfc vsphere imporove preformance of list_nodes
get the status of all the vms in one go vs one at a time.
was: real    2m45.374s
now: real    0m6.641s
2014-10-10 12:30:08 -04:00
Steve Weber
53cda4eb96 get list of vm names fast
get list of vm names FAST without hacky slow code.
time went from 30s to 0.5s on our env.
2014-10-10 11:36:38 -04:00
Nicole Thomas
80379c19f4 Merge pull request #16541 from techhat/status
Add status.process monitoring state
2014-10-10 08:56:37 -06:00
Joseph Hall
845ca2b85a Add status.process monitoring state 2014-10-10 07:29:16 -06:00
Anita Krueger
1011b5af20 New module and state for HipChat 2014-10-10 13:33:37 +01:00
Pedro Algarvio
40e8840bc7 Merge pull request #16260 from mgwilliams/lxc
modules.lxc: expand $PATH on the container instead of the host
2014-10-10 01:44:50 +01:00
Nicole Thomas
45d9444462 Merge pull request #16523 from techhat/lxc
Remove self-referencial cross-calls from lxc module
2014-10-09 17:06:12 -06:00
Samuel M Smith
ed89941a27 Added test of functions that extract and parse opts['master'] for raet multimaster
Updated tests for as raetkey uses updated channel so needed opts['__role']
2014-10-09 16:53:10 -06:00
Joseph Hall
f6f4021408 Linting 2014-10-09 15:24:17 -06:00
Joseph Hall
3fc2cbdab6 Merge pull request #16483 from steverweber/cloud_vsphere
list_nodes_min parse vm nodes for vm names.
2014-10-09 15:16:11 -06:00
Nicole Thomas
2901e9439b Merge pull request #16514 from cachedout/master_doc_fix
Small doc fixes
2014-10-09 15:07:17 -06:00
Mike Place
32aed99cb9 Merge pull request #16515 from rallytime/remove_print
Remove print from tests
2014-10-09 14:49:03 -06:00
Joseph Hall
12f96f64e0 Merge pull request #16517 from steverweber/cloud_state
Cloud state absent was missing NOT on has_instance
2014-10-09 14:44:12 -06:00
Joseph Hall
60209231ef Removed last two cross-call refs 2014-10-09 14:32:31 -06:00
Joseph Hall
c3a6c5ea6f Remove self-referencial cross-calls 2014-10-09 14:23:24 -06:00
Erik Johnson
d3c74d967d Fix dummy versionadded entry 2014-10-09 14:34:00 -05:00
Samuel Smith
c0862a271b Merge pull request #16520 from SmithSamuelM/sam_dev1
Changed way timeout in RaetChannel.send() works
2014-10-09 12:30:51 -06:00