Avi Marcus
a836d3cff8
unify the data types to dicts -- thanks dcolish. I lost the key ordering, though.
2012-07-05 02:33:12 +03:00
Avi Marcus
f123164bde
update new return format. remove benchmark debug line
2012-07-05 01:41:02 +03:00
Avi Marcus
58ae9bff0c
Created function mysql.query with column headers, query time, and affected rows
2012-07-05 01:31:23 +03:00
Thomas S Hatch
6f62bb7dce
fix rst pep8 formatting in hacking file
2012-07-04 13:00:51 -06:00
Thomas S Hatch
0a672fbb90
Merge pull request #1579 from avimar/develop
...
Add info about how to build the docs with sphinx
2012-07-04 11:44:08 -07:00
Avi Marcus
cc029ccc34
Add more specifics about building docs: where they get built, what markup, and where the main info is stored
2012-07-04 02:06:57 +03:00
Avi Marcus
e0d21d476b
Explain the link to open docs has the actual workflow for git contributions
2012-07-04 01:52:44 +03:00
Avi Marcus
a21aa82b65
Add info about how to build the docs with sphinx
2012-07-04 01:40:10 +03:00
Jeff Schroeder
b51123b9a8
Merge pull request #1578 from Talksum/issue1576
...
Compatibility fix for zeromq 3.x (issue #1576 )
2012-07-03 14:58:46 -07:00
Mike Chesnut
ab9136e2a5
adding a test to catch the HWM setting differences between libzmq 2.x and 3.x
2012-07-03 14:45:02 -07:00
Jeff Schroeder
1b19e310a0
Merge pull request #1577 from akoumjian/develop
...
Instruct authors of state modules to check for the test parameter
2012-07-03 14:31:08 -07:00
Alec Koumjian
a22773bdde
Instruct authors of state modules to check for the test parameter
2012-07-03 14:17:52 -07:00
Jeff Schroeder
e93561a878
Merge pull request #1572 from akoumjian/develop
...
Updating Virtualenv module test with cross-platform file.remove
2012-07-03 09:16:26 -07:00
Alec Koumjian
bdb4055ce2
Updating Virtualenv module test with cross-platform file.remove
2012-07-03 08:39:11 -07:00
Jeff Schroeder
0bc522728d
Merge pull request #1570 from dcolish/develop
...
Adds file.remove to file module, #1545 . Drive by spelling correction
2012-07-03 08:10:50 -07:00
Jeff Schroeder
ae68654ec0
Merge pull request #1569 from fabulops/issue-1568
...
[Issue 1568] Updated the regex to match when there is no [arch] field.
2012-07-03 08:07:29 -07:00
Dan Colish
b43c256ea7
Adds file.remove to file module, #1545 . Drive by spelling correction
2012-07-03 07:50:02 -07:00
Adam Garside
18db26b26f
Updated the regex to match when there is no [arch] field.
...
- Thanks @avimar for the suggested regexes
- Tested on 12.04, 10.04
2012-07-03 10:23:15 -04:00
Thomas S Hatch
c1db4ca075
Merge pull request #1567 from bretep/network_bonding
...
Network bonding
2012-07-02 13:41:38 -07:00
Bret Palsson
13ffc37cb2
Document using reason for overwriting a bif
...
- Added documentation for why we are overwriting a bif in a function.
- Changed 'type' to 'iface_type' in rh_ip module since overwriting the python bif doesn't accomplish the same goal there.
2012-07-02 12:41:43 -06:00
Bret Palsson
7e96381a25
Revert "Avoid using python bifs. Rename type..."
...
We don't want this.
This reverts commit 407d6f0532
.
2012-07-02 12:36:11 -06:00
Bret Palsson
407d6f0532
Avoid using python bifs. Rename type to kind
2012-07-02 10:20:39 -06:00
Thomas S Hatch
6d66e8f918
Merge pull request #1562 from bretep/network_bonding
...
Network bonding
2012-07-02 09:13:20 -07:00
Thomas S Hatch
eb01bb8c89
Merge pull request #1560 from SEJeff/unify-user-check
...
Unify user checks
2012-07-02 08:48:34 -07:00
Bret Palsson
236259d08f
Fixed correct missing whitespace this time.
2012-07-01 21:49:56 -06:00
Bret Palsson
c75e432bec
Missing white space to separate options
2012-07-01 21:47:23 -06:00
Bret Palsson
a81b7487b5
Apply global network settings correctly
...
Before network settings would never restart because of a key error. This is now resolved.
2012-07-01 21:35:08 -06:00
Bret Palsson
9a6cda41bf
Prevent unnecessary error message
2012-07-01 21:09:08 -06:00
Bret Palsson
d7076e2649
Add quotations around ifcfg options
...
I forgot to add this to the last commit. This is required for options that contain spaces to work.
For example:
BONDING_OPTS
ETHTOOL_OPTS
2012-07-01 21:00:06 -06:00
Bret Palsson
c2ca766086
Fix interface rules
...
- Do not allow MAC addresses on bond and vlan interfaces
The MAC address should only be defined on the interface that represents the physical interface. For bonds these are the slave interfaces. For vlans, the interface representing the physical device.
- Do not allow boot proto for slave interfaces.
The bootproto will be configured on the bond master interface.
2012-07-01 20:14:18 -06:00
Bret Palsson
97ecaab1b5
Fix bonding filter
2012-07-01 19:54:58 -06:00
Jeff Schroeder
d81f208204
Minor cleanup
2012-07-01 16:50:46 -07:00
Jeff Schroeder
d6cff0e698
Finish up making sure salt-{call,run} error out gracefully
...
Fixes #1554
2012-07-01 16:46:38 -07:00
Jeff Schroeder
90fb8a4a2f
Have salt-call use the new salt.utils.verify.check_parent_dirs()
2012-07-01 16:46:38 -07:00
Jeff Schroeder
4620ef375f
salt.utils.verify: Add check_parent_dirs()
...
This is for recursively checking from the root up to the directory
containing a key such as the minion rsa key or the rotating master
AES key. If the calling process doesn't have access to one of the
parent directories, salt-call (for instance) might think that it
should try and create a new key and then fails due to perm denied.
2012-07-01 16:46:38 -07:00
Jeff Schroeder
1cf0cf7357
Fix salt-call when ran as non-root
...
Also provide a contextualized error message that knows
when you're running as the user salt is configured to
run as or you're not when you don't have any access.
Fixes #1553
2012-07-01 16:46:38 -07:00
Jeff Schroeder
6ebb8b5852
Merge pull request #1559 from lewinson/develop
...
Indicate Python 2.7 is okay
2012-07-01 09:36:11 -07:00
lewinson
ccb96b5281
Indicate Python 2.7 is okay
2012-07-01 09:28:37 -07:00
Thomas S Hatch
24d39d34f6
Merge pull request #1558 from baijum/non_tty_stdout
...
sys.stdout could be StringIO or fake object
2012-07-01 07:16:55 -07:00
Baiju Muthukadan
e8a6cdb49c
sys.stdout could be StringIO or fake object
...
`sys.stdout.fileno` attribute is not available for StringIO.
Changing sys.stdout is convenient for capturing test results.
2012-07-02 00:44:29 +05:30
Thomas S Hatch
b835a38f56
Merge pull request #1557 from s0undt3ch/greacefull_OSErrors
...
`OSError`'s fail gracefully when starting up.
2012-07-01 07:14:53 -07:00
Pedro Algarvio
79311ae867
OSError
's fail gracefully when starting up.
2012-07-01 11:47:49 +01:00
Jeff Schroeder
90d7771d05
Merge pull request #1556 from dcolish/develop
...
Fix integration.module.file tests on linux
2012-06-30 23:34:24 -07:00
Dan Colish
aacd9cc5bd
Use getpass.getuser since os.getlogin requires a tty and tests do not
...
always run with one.
2012-06-30 23:31:01 -07:00
Dan Colish
4401db9a21
Merge branch 'develop' of git://github.com/saltstack/salt into develop
2012-06-30 22:47:25 -07:00
Dan Colish
abf50324d2
Fix integration.module.file tests on linux
2012-06-30 22:47:02 -07:00
Thomas S Hatch
69a2d50eee
Merge pull request #1552 from KB1JWQ/master
...
Suggest use of force for file.symlink if needed
2012-06-30 18:13:45 -07:00
Corey Quinn
28ef27f988
Suggest use of force if symlink creation is stopped by an already present file
2012-06-30 18:10:31 -07:00
Thomas S Hatch
f2ed9f9d3a
Merge pull request #1551 from jre/develop
...
Develop
2012-06-30 17:57:59 -07:00
Thomas S Hatch
88eac0e5e6
Merge pull request #1549 from wraithan/fix_hacking_symlink
...
fix doc symlink
2012-06-30 17:52:11 -07:00