Commit Graph

37651 Commits

Author SHA1 Message Date
Thomas S Hatch
9b6e53af33 Merge pull request #19645 from RobertFach/tmpfs-argument-fix-issue-19451
added fix for matching the unit of size values for devices to the unit o...
2015-01-12 12:08:02 -07:00
Thomas S Hatch
84d23104d9 Merge pull request #19628 from jfindlay/update_lxc_commands
update lxc commands
2015-01-12 09:55:04 -07:00
Thomas S Hatch
baf838b558 Merge pull request #19632 from jfindlay/fix_ip_cmds
fix some ip commands
2015-01-12 09:27:28 -07:00
robert.fach
9da67a5727 fixed format error "string-substitution-usage-error" 2015-01-12 16:32:20 +01:00
robert.fach
c9eb4cfe67 added fix for matching the unit of size values for devices to the unit of size values in proc filesystem 2015-01-12 13:25:03 +01:00
Pedro Algarvio
014e1cd888 Merge pull request #19602 from rallytime/bp-19585
Backport #19585 to 2014.7
2015-01-11 15:38:58 +00:00
Justin Findlay
d8dc3afbb3 fix some ip commands 2015-01-10 19:41:44 -07:00
Justin Findlay
8dca3cd0e5 update lxc commands 2015-01-10 17:39:42 -07:00
jfindlay
f554acc54c Merge pull request #19616 from jfindlay/fix_win_servermanager
quote servermanager cmds
2015-01-10 15:27:09 -07:00
Justin Findlay
19d31a78fc quote servermanager cmds 2015-01-10 12:29:19 -07:00
Mike Place
329c8c5723 Merge pull request #19590 from basepi/supervisordvirtual
Always return True from supervisord virtual function
2015-01-10 08:56:36 -07:00
Mike Place
1277b71e2d Typo 2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
Thomas S Hatch
30666861cd Merge pull request #19584 from rallytime/bp-19574
Backport #19574 to 2014.7
2015-01-09 17:50:02 -07:00
Colton Myers
9659447266 Always return True from supervisord virtual function
Fixes #18044
2015-01-09 15:36:57 -07:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
Nicole Thomas
1079603c54 Merge pull request #19572 from jfindlay/cmd_fixes
fix some commands
2015-01-09 11:23:53 -07:00
Justin Findlay
acd2655770 fix some commands 2015-01-09 09:58:41 -07:00
Thomas S Hatch
4c17b14224 Merge pull request #19549 from rallytime/bp-19517
Backport #19517 to 2014.7
2015-01-08 22:02:25 -07:00
Thomas S Hatch
22c8a42180 Merge pull request #19552 from terminalmage/issue19540
Fix regression in pillar cache
2015-01-08 22:01:13 -07:00
Thomas S Hatch
47d1e65dfe Merge pull request #19556 from rallytime/fix_brew_mod
Add python_shell kwarg to brew module
2015-01-08 22:00:38 -07:00
rallytime
a8c9f95ab8 Add python_shell kwarg to brew module 2015-01-08 17:09:25 -07:00
Thomas S Hatch
8dd6f36c0c Merge pull request #19554 from rallytime/fix_disk_mod
Move python shell kwarg to correct place
2015-01-08 17:02:40 -07:00
rallytime
635898c850 Move python shell kwarg to correct place 2015-01-08 17:00:46 -07:00
Thomas S Hatch
2623aa672d Merge pull request #19541 from jfindlay/fix_pip
change one more pip command
2015-01-08 16:44:59 -07:00
Thomas S Hatch
081c96c43f Merge pull request #19537 from rallytime/bp-19344
Backport #19344 to 2014.7
2015-01-08 16:44:35 -07:00
Erik Johnson
1996656185 Look in local files for pillar data on masterless 2015-01-08 17:44:32 -06:00
Erik Johnson
e063c60691 Add a __pillar key to opts 2015-01-08 17:44:16 -06:00
Thomas S Hatch
31f825d9f2 Merge pull request #19539 from terminalmage/fix-archive-tests
Update archive tests to use python_shell=False
2015-01-08 16:43:09 -07:00
Thomas S Hatch
9f2ee27b02 Merge pull request #19542 from jfindlay/fixup_svn
fix svn module str + list error
2015-01-08 16:42:23 -07:00
Mike Place
854088c649 Merge pull request #19551 from cachedout/minor_note
Release note note
2015-01-08 16:41:46 -07:00
Mike Place
b419366443 Release note note
Fixes #18551
2015-01-08 16:41:20 -07:00
Nicole Thomas
c6bd6971d2 Merge pull request #19538 from rallytime/bp-19368
Backport #19368 to 2014.7
2015-01-08 16:39:05 -07:00
Flavian
3fe0ec8b58 Azure: catch a benign WindowsAzureConflictError when trying to create a
service that already exists. In delete if kwargs is None, set it to an
empty dict.
#19155
2015-01-08 16:23:28 -07:00
rallytime
ea769829af Fix my pylint errors 2015-01-08 15:09:55 -07:00
Justin Findlay
1768e429f5 fix svn module str + list error 2015-01-08 14:29:20 -07:00
Justin Findlay
b13532b547 change one more command 2015-01-08 13:57:10 -07:00
rallytime
41841701e7 Fix djangomod.py integration test failures 2015-01-08 12:57:11 -07:00
rallytime
2443d11282 Change file perms back to executable 2015-01-08 12:56:27 -07:00
rallytime
8eab15780e Change file perms on runtests.py 2015-01-08 12:56:17 -07:00
rallytime
a150447b15 pylint fix 2015-01-08 12:56:09 -07:00
rallytime
6f74048688 Fix blockdev module unit tests 2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332 Update archive tests to use python_shell=False 2015-01-08 13:51:47 -06:00
rallytime
4282db5f27 freebsd_sysctl module python shell kwarg additons 2015-01-08 12:34:04 -07:00
rallytime
439e60f960 freebsdservice module python shell kwarg additions 2015-01-08 12:34:04 -07:00
rallytime
a8f26aec90 extfs module python shell kwarg additions 2015-01-08 12:34:04 -07:00
rallytime
56395c3c77 dpkg module python shell kwarg additions 2015-01-08 12:34:04 -07:00
rallytime
9fab0788e1 django module python_shell=False additions 2015-01-08 12:34:04 -07:00
rallytime
50ae318794 disk module python_shell=False addition 2015-01-08 12:34:03 -07:00
rallytime
01e150b9b3 debconfmod module python_shell=False addition 2015-01-08 12:34:03 -07:00