Mike Place
0ac3e624af
Remove a documentation surprise
2015-01-14 15:28:40 -07:00
Nicole Thomas
559c52bf74
Merge pull request #19724 from rupeshta/genesis_unit_tests
...
test genesis tests
2015-01-14 08:17:58 -07:00
Rupesh Tare
2ab5d0bfdf
test genesis tests
2015-01-14 16:29:14 +05:30
Nicole Thomas
63e207ee30
Merge pull request #19662 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-01-13 15:23:09 -07:00
Mike Place
8e26499c19
Merge pull request #19704 from cachedout/aes_fix
...
Fix key error preventing master start
2015-01-13 12:49:44 -07:00
Mike Place
3d1f02d1b3
Fix key error preventing master start
2015-01-13 12:49:16 -07:00
Mike Place
e354b69391
Merge pull request #19693 from cachedout/transport_fix
...
Fix up transport __init__
2015-01-13 12:10:15 -07:00
Colton Myers
8363db9d29
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-01-13 12:09:56 -07:00
Colton Myers
9390886412
Merge pull request #19699 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-13 11:59:45 -07:00
Colton Myers
2a6c9a8165
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/ssh/index.rst
2015-01-13 11:58:58 -07:00
Mike Place
5c8c7da49d
Merge pull request #19696 from cachedout/lint
...
More linting
2015-01-13 11:16:23 -07:00
Mike Place
845271d31c
More linting
2015-01-13 11:15:45 -07:00
Mike Place
e04952b58e
Merge pull request #19695 from cachedout/more_gitignore
...
Ignore some auto-generated files in test dir
2015-01-13 11:03:25 -07:00
Mike Place
8e504f09d1
Ignore some auto-generated files in test dir
2015-01-13 11:02:52 -07:00
Mike Place
40bc220f1b
Fix up transport __init__
...
Fixed style errors, incorrect overriden argspec and missing function
inherited from abstract.
Also reverted import changes which need to be where they were to allow
raet to operate correctly.
2015-01-13 10:57:09 -07:00
Nicole Thomas
c215532a7f
Merge pull request #19692 from rallytime/pylint_fifteen
...
Pylint fix for 2015.2 branch
2015-01-13 10:40:15 -07:00
rallytime
7ff92cec9a
Pylint fix for 2015.2 branch
2015-01-13 10:39:19 -07:00
Thomas S Hatch
80ec40b197
Merge pull request #19689 from rallytime/locale_versionadded
...
Add versionadded directives to newer locale functions
2015-01-13 08:43:49 -07:00
rallytime
0b96b134dc
Add versionadded directives to newer locale functions
...
Fixes #19607
2015-01-13 08:40:24 -07:00
Thomas S Hatch
231bd75a4e
Merge pull request #19688 from rominf/fish-completion
...
[fish shell completion] adopt for non-interactive usage (e.g. from scripts)
2015-01-13 08:30:51 -07:00
Thomas S Hatch
9d377a97da
Merge pull request #19687 from techhat/joyent
...
Allow joyent api host suffix to be configurable
2015-01-13 08:30:30 -07:00
Thomas S Hatch
2da27f0ddd
Merge pull request #19682 from kev009/freebsd-kmods
...
FreeBSD kmod bugfixes
2015-01-13 08:28:12 -07:00
Thomas S Hatch
a16824ec48
Merge pull request #19680 from jayeshka/cpan-unit-tests
...
adding cpan test case
2015-01-13 08:26:31 -07:00
Thomas S Hatch
640a717859
Merge pull request #19678 from davidjb/doc-saltfile-ssh
...
Expand documentation about Saltfile for salt-ssh
2015-01-13 08:26:06 -07:00
Thomas S Hatch
49f98ff858
Merge pull request #19677 from aneeshusa/output-subsystem
...
Remove obsolete unreferenced tuple of static outputters.
2015-01-13 08:25:36 -07:00
Thomas S Hatch
200a6ea47f
Merge pull request #19676 from davidjb/git-error-verbosity
...
Improve error reporting for failing git module commands
2015-01-13 08:24:55 -07:00
Thomas S Hatch
941eff3854
Merge pull request #19675 from nmadhok/patch-1
...
Adding missing import so that new caller instance can be instantiated without AttributeError
2015-01-13 08:21:22 -07:00
Thomas S Hatch
ba857d6694
Merge pull request #19672 from elmarshar/patch-2
...
Update mysql_query.py
2015-01-13 08:19:34 -07:00
Thomas S Hatch
f1391fb8d9
Merge pull request #19667 from cachedout/ssh_tests
...
Fix tests
2015-01-13 08:14:34 -07:00
Thomas S Hatch
1eb0b4b0e2
Merge pull request #19661 from basepi/sysctlretcode19606
...
Suppress retcode warnings for systemd enabled check, Fixes #19606
2015-01-13 08:13:15 -07:00
Thomas S Hatch
9942ca20fb
Merge pull request #19615 from h4ck3rm1k3/template_debugging
...
template debugging
2015-01-13 08:07:07 -07:00
Joseph Hall
11d802d873
Allow joyent api host suffix to be configurable
2015-01-13 07:32:02 -07:00
Jayesh
d2a5eda14a
resolved pylint error
2015-01-13 17:54:45 +05:30
Kevin Bowling
edd4fba112
Bugfix my freebsdkmod implementation
2015-01-13 04:18:25 -07:00
Jayesh
2aa6479d25
adding cpan test case
2015-01-13 15:56:21 +05:30
Kevin Bowling
1373a257e5
Garbage collect unused private method
2015-01-13 02:15:19 -07:00
Kevin Bowling
1c7e55e175
pep8 kmod and freebsdkmod execution modules
2015-01-13 01:38:47 -07:00
Kevin Bowling
91cf8afdb8
Fix freebsdkmod lsmod()
2015-01-13 01:34:50 -07:00
Kevin Bowling
5873041a12
Add persistent module capabilities to freebsdkmod
2015-01-13 01:24:24 -07:00
Aneesh Agrawal
b828add446
Add blank line to conform with PEP8 (E302).
2015-01-13 01:55:24 -05:00
David\ Beitey
839968f637
Expand documentation about Saltfile for salt-ssh
2015-01-13 16:50:29 +10:00
Aneesh Agrawal
9aa5f2d6d4
Remove obsolete unreferenced tuple of static outputters.
...
Completes commit 9f758a8#6608 .
2015-01-13 01:39:18 -05:00
David\ Beitey
7b3089a076
Ensure git command execution failures describe what command failed, not just stderr, which can be empty
2015-01-13 15:35:40 +10:00
Thomas S Hatch
c368b88963
Merge pull request #19665 from cachedout/tornado_test_timeout
...
Fix tornado tests
2015-01-12 22:15:03 -07:00
Nitin Madhok
94e1d5ff08
Adding missing import causing new caller instance from being instantiated. Fixes #19674
2015-01-13 00:00:33 -05:00
Mike Place
fc9a647a3b
Remove assert:
2015-01-12 18:53:56 -07:00
Elmar Shar
71a4a51005
Update mysql_query.py
...
mysql_query.py doesn't correctly iterate through dict res variable.
Before, if you specifying the following query:
"SELECT name FROM table LIMIT 1;"
it throws the following error: ValueError: too many values to unpack
However selected a 2 char column name such as:
SELECT ab FROM table LIMIT 1;
produces the following in the output: "a:b"
2015-01-13 12:26:29 +11:00
James Michael DuPont
182665e635
removing prints
2015-01-12 19:23:33 -06:00
Nicole Thomas
a48e5654f2
Merge pull request #19664 from s0undt3ch/2014.7
...
[2014.7] Update the bootstrap script to latest stable v2015.01.12
2015-01-12 16:25:11 -07:00
Mike Place
cba0d6d597
Fix tests
2015-01-12 16:01:10 -07:00
