Thomas S Hatch
8af9f6cb61
pillar is not loaded before the router
2014-06-26 15:34:01 -06:00
Thomas S Hatch
25b400cc76
Clean up pillar loading behavior
2014-06-26 15:18:56 -06:00
Thomas S Hatch
94748e816e
LoadPillar behavior should be dirrect
2014-06-26 15:04:30 -06:00
Thomas S Hatch
d2d45a6430
Add sleep to make sure the event jids don't collide
2014-06-26 14:01:37 -06:00
Thomas S Hatch
6c91249e65
Add pillar loading to the minion floscript
2014-06-26 13:57:23 -06:00
Thomas S Hatch
81f0c5f605
Load up the initial pillar
2014-06-26 13:56:38 -06:00
Erik Johnson
b0f232744d
Merge pull request #13766 from nmadhok/fix-rh-service-module
...
Fixes the problem where service module is unavailable on RedHat, CentOs
2014-06-26 13:30:56 -05:00
Thomas S Hatch
4551c46abb
Give minions a unique pki dir in raet minion swarm
2014-06-26 12:19:31 -06:00
Nitin Madhok
0562d1a8a5
Fixing merge conflicts
2014-06-26 13:57:14 -04:00
Nitin Madhok
5157c2c93b
Fixing merge conflict
2014-06-26 13:55:57 -04:00
Nitin Madhok
84ed5b7863
Fixes the problem where service module is unavailable on RedHat, CentOs and Scientific Linux
2014-06-26 13:44:45 -04:00
Joseph Hall
360cc7d80b
Merge pull request #13763 from nmadhok/fix-lint
...
Fixing pylint violations
2014-06-26 11:42:57 -06:00
Joseph Hall
07eb509828
Merge pull request #13765 from rallytime/gce_docs
...
clarifications to gce cloud docs
2014-06-26 11:42:18 -06:00
Thomas S Hatch
ecc9b33859
iraet swarm needs ports
2014-06-26 11:35:12 -06:00
rallytime
7778a6e24d
clarifications to gce cloud docs
2014-06-26 11:31:52 -06:00
Aditya Kulkarni
a23f320080
Merge pull request #13764 from pass-by-value/more_test_fixes
...
Update expected message
2014-06-26 13:30:20 -04:00
Thomas S Hatch
d422e45fd7
Add worker sleep betwen creation
2014-06-26 11:27:31 -06:00
Thomas S Hatch
e20da9feca
Add sock_dir to raet swarming
2014-06-26 11:04:11 -06:00
Aditya Kulkarni
b991977e69
Update expected message
2014-06-26 12:58:49 -04:00
Nitin Madhok
ef40d823f1
Fixing pylint violations
2014-06-26 12:53:56 -04:00
Thomas S Hatch
cf2cf9bc9f
Merge pull request #13748 from simoncadman/develop
...
CentOS 7 and Scientific Linux 7 should also use systemd module
2014-06-26 09:52:44 -06:00
Joseph Hall
c7ef5ef0b2
Merge pull request #13762 from pass-by-value/master_tops_test_fix
...
Fix paths
2014-06-26 08:40:51 -06:00
Aditya Kulkarni
54110a9658
Fix paths
2014-06-26 10:18:58 -04:00
Joseph Hall
ad4b90643c
Merge pull request #13760 from stanim/fixed-clock-format-typo
...
gnomedesktop typo: clock_format instead of clock_show_format
2014-06-26 07:25:58 -06:00
Stani
f58c1c83c8
gnomedesktop typo: clock_format instead of clock_show_format
2014-06-26 14:50:50 +02:00
Thomas S Hatch
b1bdae803f
Fix #13744
2014-06-25 22:14:26 -06:00
Mike Place
22d2e812ef
Merge pull request #13751 from claytron/doc-fixes
...
fix errors in docs
2014-06-25 21:28:35 -06:00
Clayton Parker
23c494c8ce
fix errors in docs
2014-06-25 22:54:37 -04:00
Simon Cadman
9261802aa1
CentOS 7 and Scientific Linux 7 should also use systemd module
2014-06-26 00:35:34 +01:00
Pedro Algarvio
e8e9c2f0c3
Merge pull request #13747 from nmadhok/fix-lint
...
Fixing pylint violations
2014-06-26 00:33:44 +01:00
Nitin Madhok
6773a34c1f
Fixing pylint violations
2014-06-25 19:27:16 -04:00
Pedro Algarvio
53eef3d2c2
Merge pull request #13746 from whiteinge/netapi-packages-setup
...
Add netapi packages to setup.py packages list
2014-06-26 00:20:34 +01:00
Seth House
cc5fe7f368
Add netapi packages to setup.py packages list
2014-06-25 17:08:17 -06:00
Thomas S Hatch
38d43851cd
Merge pull request #13742 from garethgreenaway/schedule_fixes
...
Fixes to schedule module and state for error conditions.
2014-06-25 16:09:43 -06:00
Colton Myers
7a91c547d9
Merge pull request #13743 from basepi/recon_max
...
Make ``recon_max`` 10 seconds, down from 59 seconds
2014-06-25 15:59:00 -06:00
Colton Myers
e032a53a1a
Make `recon_max` 10 seconds, down from 59 seconds
...
Some large infrastructures will want a higher value here to prevent auth
floods, but a value of 59 seconds will result in up to a minute delay on
a master restart before minions come back. 10 seconds is a more
reasonable default here.
2014-06-25 15:55:43 -06:00
Gareth J. Greenaway
8221675747
Fixes to schedule module and state for error conditions.
2014-06-25 14:26:13 -07:00
Aditya Kulkarni
3e423b4818
Merge pull request #13730 from pass-by-value/test_master_tops
...
Add regression test for master_tops
2014-06-25 17:19:54 -04:00
Colton Myers
b6fcc0f5bc
Merge pull request #13741 from basepi/2014.1.6release
...
Add 2014.1.6 release notes
2014-06-25 15:06:28 -06:00
Colton Myers
f53e3b4a54
Add 2014.1.6 release notes
2014-06-25 15:05:44 -06:00
Joseph Hall
1649c3da0b
Merge pull request #13740 from jessecollier/develop
...
Adding expect fork to upstart script
2014-06-25 15:05:23 -06:00
Thomas S Hatch
2c7a8d265e
Merge pull request #13728 from ticosax/remove-bbb-code
...
Since we do not support older versions of docker-py than 0.3.2
2014-06-25 14:58:49 -06:00
Aditya Kulkarni
55c92b4eeb
Move master top file before test
2014-06-25 16:50:17 -04:00
Thomas S Hatch
0edaa1a603
Merge pull request #13727 from garethgreenaway/host_state_multiple_ips
...
Adding the ability to manage hosts in /etc/hosts will multiple IP addresses
2014-06-25 14:41:05 -06:00
Thomas S Hatch
5f959591c6
Merge pull request #13713 from terminalmage/issue13672
...
Allow traversing dicts nested with lists when matching
2014-06-25 14:40:26 -06:00
Thomas S Hatch
317669a531
Merge pull request #13735 from lyft/another-fix-for-supervisord
...
Fix incorrect already running to already started message check for super...
2014-06-25 14:39:58 -06:00
Thomas S Hatch
ed38a481d6
Merge pull request #13738 from UtahDave/develop
...
Open files with 'rb' and catch msgpack deserialization errors
2014-06-25 14:39:21 -06:00
Jesse Collier
e04043aabd
Adding expect fork to upstart script
2014-06-25 13:33:56 -07:00
Joseph Hall
f4b30eddff
Merge pull request #13736 from jessecollier/develop
...
Fixing bug that prevents correct status with upstart
2014-06-25 14:14:11 -06:00
Joseph Hall
337f03bb3d
Merge pull request #13737 from christabor/syntax-labels
...
Add a fix for long lines.
2014-06-25 14:03:51 -06:00
