regilero
|
2e48812cfa
|
Merge remote-tracking branch 'upstream/develop' into mysql_additions
|
2013-12-12 22:10:50 +01:00 |
|
regilero
|
9a0d33cb83
|
Small Lint fix
|
2013-12-12 22:10:32 +01:00 |
|
regilero
|
9eeb8940a4
|
Be nice with sphinx, in case of, keep password example in ascii
|
2013-12-12 21:58:07 +01:00 |
|
regilero
|
f1fc1557ff
|
MySQL module: replace some modula string by format ones, add big comments about the way escapes are working in this module.
|
2013-12-12 21:54:06 +01:00 |
|
Joseph Hall
|
ceab83fcef
|
Merge pull request #9214 from ffzg/develop
Always generate same order of bonding options
|
2013-12-12 12:29:56 -08:00 |
|
regilero
|
f1b6b4af55
|
MySQL tests: add a localhost target on mysqladmin test to check for MySQL server presence
|
2013-12-12 21:23:52 +01:00 |
|
Luka Blaskovic
|
8db3b46069
|
Always generate same order of bonding options
When generating bonding interface on Debian bonding options are ordered
"randomly" producing unneded interface updates.
|
2013-12-12 20:23:46 +01:00 |
|
Thomas S Hatch
|
0880c73c43
|
load in a fake config.get function to fix tests
Mocking may be a better way of doing this, but since these are
generated at the top of the test I felt that this solution was also viable
|
2013-12-12 11:50:53 -07:00 |
|
Aditya Kulkarni
|
0d5bd66f15
|
Merge pull request #9211 from pass-by-value/docstring_move
Move docstring to the right function
|
2013-12-12 10:55:08 -08:00 |
|
Aditya Kulkarni
|
a618ba2026
|
Move docstring to the right function
|
2013-12-12 13:49:02 -05:00 |
|
Joseph Hall
|
2d687eace1
|
Merge pull request #9210 from techhat/issue9202
Force jumps and their arguments to always appear last
|
2013-12-12 10:45:45 -08:00 |
|
Joseph Hall
|
6dc9ad9c04
|
Force jumps and their arguments to always appear last
|
2013-12-12 11:43:59 -07:00 |
|
Thomas S Hatch
|
800cebaeba
|
Merge pull request #9209 from WillPlatnick/fix_rbenv_update
Fix rbenv updating
|
2013-12-12 10:38:27 -08:00 |
|
Thomas S Hatch
|
30d6e2fabb
|
Merge pull request #9207 from pass-by-value/signature_addon
Tweak signature api call
|
2013-12-12 10:35:04 -08:00 |
|
Thomas S Hatch
|
dd16fb9ec0
|
Merge pull request #9208 from cachedout/roots_gitfs_testing
Extreme-self-tab-lart
|
2013-12-12 10:34:08 -08:00 |
|
Mike Place
|
6c991e3216
|
Extreme-self-tab-lart
|
2013-12-12 11:31:11 -07:00 |
|
Will Platnick
|
112a212b93
|
Fix rbenv updating
|
2013-12-12 13:29:38 -05:00 |
|
Thomas S Hatch
|
122c5af528
|
syntax fix
|
2013-12-12 11:25:46 -07:00 |
|
Aditya Kulkarni
|
b3e4796876
|
Tweak signature api call
|
2013-12-12 13:23:46 -05:00 |
|
Thomas S Hatch
|
a8b8704426
|
Catch url errors as well
|
2013-12-12 11:19:20 -07:00 |
|
Thomas S Hatch
|
fa9a8212e8
|
some pylint
|
2013-12-12 11:11:58 -07:00 |
|
Thomas S Hatch
|
446a7da371
|
Merge pull request #9181 from dlangille/develop
Fix parameters going into pkg.install and correct a comment
|
2013-12-12 10:03:44 -08:00 |
|
Joseph Hall
|
3b6af421d7
|
Merge pull request #9206 from basepi/waitwatch8612
Add alias for cmd.watch (from cmd.wait) state, Fix #8612
|
2013-12-12 09:52:40 -08:00 |
|
Colton Myers
|
91fd86ed8b
|
Make watch work in mod_watch
|
2013-12-12 10:49:05 -07:00 |
|
Thomas S Hatch
|
8f4915a5d3
|
Add return data to the wheel return seq
|
2013-12-12 10:43:49 -07:00 |
|
Thomas S Hatch
|
a9bcf2ca67
|
Merge pull request #9196 from cachedout/roots_gitfs_testing
Roots gitfs testing
|
2013-12-12 09:45:14 -08:00 |
|
Colton Myers
|
54f03a809f
|
Add alias for cmd.watch to cmd.wait
|
2013-12-12 10:41:45 -07:00 |
|
Colton Myers
|
6caa7cc146
|
Merge pull request #9205 from basepi/minerunner
Pass in the target, not the string 'tgt'
|
2013-12-12 09:23:54 -08:00 |
|
Colton Myers
|
fde25fdd8b
|
Pass in the target, not the string 'tgt'
|
2013-12-12 10:23:17 -07:00 |
|
Mike Place
|
7405a4eaf3
|
Pylinting.
|
2013-12-12 10:16:45 -07:00 |
|
Mike Place
|
6027940a55
|
More gitfs integration testing.
|
2013-12-12 10:16:45 -07:00 |
|
Thomas S Hatch
|
4bdac34782
|
Merge pull request #9197 from garethgreenaway/develop
removing unncessary argument from _write_file_ifaces.
|
2013-12-12 09:08:47 -08:00 |
|
Joseph Hall
|
6ae19c315c
|
Merge pull request #9204 from yannj-fr/develop
Adding insert method to states.iptables
|
2013-12-12 08:39:55 -08:00 |
|
yjo
|
441d260dbe
|
Adding insert method to states.iptables
|
2013-12-12 17:31:09 +01:00 |
|
C. R. Oldham
|
2ae1bdd8f7
|
Merge pull request #9203 from techhat/issue9202
Make --to-port(s) appear after --jump
|
2013-12-12 07:51:08 -08:00 |
|
Joseph Hall
|
f5d190e98e
|
Make --to-port(s) appear after --jump
|
2013-12-12 08:47:09 -07:00 |
|
Joseph Hall
|
961b3a31b3
|
Merge pull request #9201 from ffzg/develop
Fix debian network interfaces order
|
2013-12-12 07:07:28 -08:00 |
|
Luka Blaskovic
|
8fca18f891
|
Fix debian network interfaces order
Generate interfaces on Debian in correct order, strictly needed for some
interface types (e.g., bond).
|
2013-12-12 15:35:11 +01:00 |
|
Pedro Algarvio
|
535dd59c30
|
Merge pull request #9200 from s0undt3ch/hotfix/virtual-terminal-merge
Hotfix/virtual terminal merge
|
2013-12-12 01:53:58 -08:00 |
|
Pedro Algarvio
|
80383fb091
|
Typo.
|
2013-12-12 09:53:37 +00:00 |
|
Pedro Algarvio
|
d8453a4b91
|
Make sure we can actually get the size of the terminal before trying.
|
2013-12-12 09:53:36 +00:00 |
|
Pedro Algarvio
|
2253fcf63b
|
Removed trailing white-space. Minor cosmetic change.
|
2013-12-12 08:38:42 +00:00 |
|
Pedro Algarvio
|
7fb8041e24
|
Merge pull request #9198 from gravyboat/develop
Updated the cmd state docs to resolve 8795, and 7902.
|
2013-12-12 00:29:32 -08:00 |
|
Forrest Alvarez
|
8f73f8142e
|
Updated the cmd state docs to resolve 8795, and 7902.
|
2013-12-12 05:37:22 +00:00 |
|
Gareth J. Greenaway
|
f329b091bb
|
removing the DIR argument from the call to _write_file_ifaces.
|
2013-12-11 20:08:09 -08:00 |
|
Gareth J. Greenaway
|
3d5c1543ef
|
removing unncessary argument from _write_file_ifaces.
|
2013-12-11 17:44:31 -08:00 |
|
Thomas S Hatch
|
9e715bb7c8
|
Merge pull request #9195 from basepi/gitlatestargs9107
Add checking for rev and mirror/bare args in git.latest, Fix #9107
|
2013-12-11 16:00:31 -08:00 |
|
Colton Myers
|
056d178bd5
|
Add checking for rev and mirror/bare args in git.latest, Fix #9107
|
2013-12-11 16:49:25 -07:00 |
|
Seth House
|
c2b563a56f
|
Switched back the order of the she-bang and the Python coding decl.
This script (in its current form) is intended to be invoked as a shell
script so the she-bang must come first.
|
2013-12-11 16:04:09 -07:00 |
|
Thomas S Hatch
|
d589a41d30
|
Merge pull request #9192 from ffzg/develop
Add missing layer2+3 transmit hash policy in bond network configurations
|
2013-12-11 14:46:40 -08:00 |
|