Commit Graph

242 Commits

Author SHA1 Message Date
Joey Hess 0126c41a53
propellor spin 2014-09-08 12:46:54 -04:00
Joey Hess b21feb9e8d
propellor spin 2014-09-08 10:56:08 -04:00
Joey Hess 3cb9a60f89
propellor spin 2014-08-21 15:52:49 -04:00
Joey Hess 3822c9a2d7
propellor spin 2014-08-21 14:04:26 -04:00
Joey Hess ceb56ac32b keep warning of out of date after updating upstream/master, until it gets merged 2014-08-19 19:22:54 -04:00
Joey Hess db1cf96dd7 remove origin remote after local clone
It's not useful, since it'll change to something that cannot be directly
merged with.
2014-08-19 19:03:05 -04:00
Joey Hess d6320b8130 -X 2014-08-19 17:59:15 -04:00
Joey Hess 5d92ed6ea7 need to -s theirs or the merge is likely to fail 2014-08-19 17:57:32 -04:00
Joey Hess d289a222d5 simpler merge
Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suitable for mergeing into the user's repo. No need for
manual diff, which can fail on eg, binaries or no changes.
2014-08-19 17:54:49 -04:00
Joey Hess adf8b2ec34 need to connect up history 2014-08-19 17:51:34 -04:00
Joey Hess 1bf736293d syntax 2014-08-19 17:17:36 -04:00
Joey Hess 7743da0c3d syntax 2014-08-19 17:17:01 -04:00
Joey Hess d54ee6c336 color message 2014-08-19 17:12:57 -04:00
Joey Hess f72a1aa690 fixes 2014-08-19 17:09:11 -04:00
Joey Hess 1ada0f1014 fix ref name 2014-08-19 16:47:00 -04:00
Joey Hess 4ae9578e36 head file will end with a newline 2014-08-19 16:44:51 -04:00
Joey Hess 3c61c109fb ugly workaround for lack of history in repo distributed with debian package 2014-08-19 16:40:04 -04:00
Joey Hess e0bbb776bf final fixes 2014-08-19 15:29:32 -04:00
Joey Hess 8e45b0f77b warnings 2014-08-19 15:23:29 -04:00
Joey Hess 1830f501ee debian upgrade handling
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version is available from origin.
2014-08-19 15:22:42 -04:00
Joey Hess 527ae1dc20 typo 2014-08-19 15:06:06 -04:00
Joey Hess 71ccd256da stop removing privdata, it's no longer in master 2014-08-19 15:04:12 -04:00
Joey Hess 7d59dee469 local repo fully working now 2014-08-19 15:02:12 -04:00
Joey Hess b6c5f54741 The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package. 2014-08-19 14:35:38 -04:00
Joey Hess 08a3c52017
propellor spin 2014-07-23 12:48:46 -04:00
Joey Hess ac46ab4d0c
propellor spin 2014-07-23 12:33:44 -04:00
Joey Hess 3d617fd98b
propellor spin 2014-07-23 12:33:11 -04:00
Joey Hess 41a23743e7
propellor spin 2014-07-23 12:27:38 -04:00
Joey Hess dd32a63a07
propellor spin 2014-07-23 12:25:38 -04:00
Joey Hess ecc275cfeb
propellor spin 2014-07-23 12:23:44 -04:00
Joey Hess 7d3c09df5f
propellor spin 2014-07-23 11:52:46 -04:00
Joey Hess 78bbd860c6
propellor spin 2014-07-23 10:54:21 -04:00
Joey Hess 321a0bdef6
propellor spin 2014-07-23 10:52:26 -04:00
Joey Hess 660f77c28f
propellor spin 2014-07-22 16:40:11 -04:00
Joey Hess ed83966460
propellor spin 2014-07-22 16:29:22 -04:00
Joey Hess dc1a8db064
propellor spin 2014-07-22 16:28:04 -04:00
Joey Hess e01fc46ba3
propellor spin 2014-07-22 16:21:54 -04:00
Joey Hess 400422a7e6
propellor spin 2014-07-22 15:27:44 -04:00
Joey Hess 98a3114763
propellor spin 2014-07-22 15:25:07 -04:00
Joey Hess 7028c2c9cc
propellor spin 2014-07-18 16:45:40 -04:00
Joey Hess 51edffe173
propellor spin 2014-07-18 16:43:11 -04:00
Joey Hess 93730d530a
propellor spin 2014-07-18 16:40:09 -04:00
Joey Hess d5abbeb116
propellor spin 2014-07-18 15:59:17 -04:00
Joey Hess fd7d6907b8
propellor spin 2014-07-18 15:58:05 -04:00
Joey Hess ef472be6a6
propellor spin 2014-07-18 14:42:46 -04:00
Joey Hess 90682a7984
propellor spin 2014-07-18 14:36:51 -04:00
Joey Hess 0d188bf5f6
propellor spin 2014-07-18 14:33:30 -04:00
Joey Hess 4d38e8bfd6
propellor spin 2014-07-18 13:09:55 -04:00
Joey Hess 614a6a13ac
propellor spin 2014-07-18 13:03:13 -04:00
Joey Hess 1143ca7c5c
propellor spin 2014-07-18 12:48:08 -04:00
Joey Hess ad80a1600d
propellor spin 2014-07-18 12:39:45 -04:00
Joey Hess 6e490dff6e
propellor spin 2014-07-18 12:35:00 -04:00
Joey Hess 00b7323d4e
propellor spin 2014-07-18 12:22:50 -04:00
Joey Hess 8aabde7a3a
propellor spin 2014-07-18 02:51:47 -04:00
Joey Hess 9a31b95e7d
propellor spin 2014-07-18 02:35:32 -04:00
Joey Hess f93b2f5e52
propellor spin 2014-07-18 02:27:15 -04:00
Joey Hess 6957f28945
propellor spin 2014-07-18 02:08:13 -04:00
Joey Hess 2812719e54
propellor spin 2014-07-18 01:03:05 -04:00
Joey Hess fddcf13973
propellor spin 2014-07-18 00:36:21 -04:00
Joey Hess 5590c1c75a
propellor spin 2014-07-18 00:20:09 -04:00
Joey Hess 863cdf470b
propellor spin 2014-07-17 23:51:11 -04:00
Joey Hess 8b90fc9a52
propellor spin 2014-07-17 23:43:33 -04:00
Joey Hess a6a82a23a9
propellor spin 2014-07-17 23:42:10 -04:00
Joey Hess 93a2b92f62
propellor spin 2014-07-17 23:41:17 -04:00
Joey Hess c27afcea4e
propellor spin 2014-07-17 23:36:04 -04:00
Joey Hess 55a638ad4c Fix bug in File.containsLines that caused lines that were already in the file to sometimes be appended to the end. 2014-07-17 23:33:10 -04:00
Joey Hess c65e9adc7f
propellor spin 2014-07-17 23:27:42 -04:00
Joey Hess cfb758d655 better hasPrivContentExposed
Avoid locking down and then lossening the file mode; just use the
default/current mode from the beginning.
2014-07-17 22:35:59 -04:00
Joey Hess 91d148215a
propellor spin 2014-07-17 22:27:57 -04:00
Joey Hess f4ce2124ac
propellor spin 2014-07-17 22:23:49 -04:00
Joey Hess 3e41d350f4
propellor spin 2014-07-17 22:20:16 -04:00
Joey Hess cb7009e994
propellor spin 2014-07-17 21:47:15 -04:00
Joey Hess e242c68de7
propellor spin 2014-07-17 21:35:43 -04:00
Joey Hess e31210248d
propellor spin 2014-07-17 21:16:03 -04:00
Joey Hess b0fd7f0006
propellor spin 2014-07-17 16:16:13 -04:00
Joey Hess c8feea04e1
propellor spin 2014-07-17 15:54:32 -04:00
Joey Hess 330c00efa4
propellor spin 2014-07-17 15:53:12 -04:00
Joey Hess a788c957d2
propellor spin 2014-07-17 15:36:11 -04:00
Joey Hess 79f1a6c67b
propellor spin 2014-07-17 15:33:02 -04:00
Joey Hess ebb7353f49
propellor spin 2014-07-17 15:06:24 -04:00
Joey Hess bae7e08597
propellor spin 2014-07-07 11:32:29 -04:00
Joey Hess e53faff843
propellor spin 2014-07-07 03:42:35 -04:00
Joey Hess 461b8cbd32
propellor spin 2014-07-07 03:16:18 -04:00
Joey Hess dba84b8219
propellor spin 2014-07-07 03:08:12 -04:00
Joey Hess a1679dfd92
propellor spin 2014-07-07 03:00:49 -04:00
Joey Hess 8c2a9de94b
propellor spin 2014-07-07 02:58:34 -04:00
Joey Hess 8f46b7ab68 Run apt-get update in initial bootstrap.
For eg, Linode, which brings up hosts that have not updated at all so
apt-get install doesn't work.
2014-07-07 02:04:21 -04:00
Joey Hess bc8b7f2173
propellor spin 2014-07-07 02:01:57 -04:00
Joey Hess 75ba4c5ccc
propellor spin 2014-07-07 02:00:04 -04:00
Joey Hess 593043515f
propellor spin 2014-07-07 01:57:59 -04:00
Joey Hess a0fb0f9928
propellor spin 2014-07-07 01:54:28 -04:00
Joey Hess 8298cb7875
propellor spin 2014-07-07 01:48:13 -04:00
Joey Hess 7330737b79 reorg 2014-07-06 19:40:03 -04:00
Joey Hess 53bb64040a wording 2014-07-06 17:58:27 -04:00
Joey Hess cd37316dd5 propigate required privdata fields out from docker containers to the hosts they're docked in 2014-07-06 17:54:06 -04:00
Joey Hess eb39b45d61 desc 2014-07-06 17:43:48 -04:00
Joey Hess 36ce624750 trivial 2014-07-06 17:42:25 -04:00
Joey Hess e2019aa7a8
propellor spin 2014-07-06 17:37:10 -04:00
Joey Hess e6ce744078 move privdata Property to toplevel so its Info propigates
Ugh, that's a nasty gotcha but I cannot see a way to fix it generally right
now.
2014-07-06 17:16:04 -04:00
Joey Hess 20df4170b0 beautiful table for --list-fields, with the hostnames 2014-07-06 16:46:00 -04:00