Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	ae477d69c8
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-26 11:18:35 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	653012ee5f
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-26 11:17:16 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	dfdd77eff4
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-26 11:00:38 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	6e4533cb14
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-20 20:40:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Heule
								
							 
						 | 
						
							
							
								
							
							
	e1766aa070
						 | 
						
							
							
								
								
								reverted the change to .html in generating the reference, since I have
							
							
							
							
							
							
							
							
							fooled myself ... 
							
						 | 
						
							2014-03-20 19:04:09 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Heule
								
							 
						 | 
						
							
							
								
							
							
	b5b1a25e4f
						 | 
						
							
							
								
								
								fixed some formulations and removed a debug statement
							
							
							
							
							
							
						 | 
						
							2014-03-20 18:53:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Heule
								
							 
						 | 
						
							
							
								
							
							
	b87b5eab31
						 | 
						
							
							
								
								
								documentation to __object in execution run
							
							
							
							
							
							
						 | 
						
							2014-03-20 16:23:28 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	10a71eb35a
						 | 
						
							
							
								
								
								notes for 3.0 -> 3.1 update
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-19 19:00:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2b03ccd776
						 | 
						
							
							
								
								
								changes for 3.1.0
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-19 18:57:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	bcca8a637b
						 | 
						
							
							
								
								
								Merge branch 'master' into type__rbenv
							
							
							
							
							
							
						 | 
						
							2014-03-13 10:30:48 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	d288ee1cde
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-11 15:40:44 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	19f6126a0f
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-03-03 07:42:27 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	d6b7033f2b
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-22 10:13:51 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	9c6defe17c
						 | 
						
							
							
								
								
								unauthenticated problem
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-18 20:17:08 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	4ce52c5a9d
						 | 
						
							
							
								
								
								-ws
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-15 11:31:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	549a1fc754
						 | 
						
							
							
								
								
								Merge branch 'issue_286' of https://github.com/dheule/cdist
							
							
							
							
							
							
						 | 
						
							2014-02-14 22:19:07 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Heule
								
							 
						 | 
						
							
							
								
							
							
	478ebd190c
						 | 
						
							
							
								
								
								transfert idea into the file in git tree, so we can close issue 286
							
							
							
							
							
							
						 | 
						
							2014-02-14 22:06:43 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	ff897bc904
						 | 
						
							
							
								
								
								Merge branch 'master' into 4.0-pre-not-stable
							
							
							
							
							
							
						 | 
						
							2014-02-14 20:58:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	ac23fa3e10
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-14 20:53:43 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2734e5069e
						 | 
						
							
							
								
								
								Merge branch '3.0' into 4.0-pre-not-stable
							
							
							
							
							
							
						 | 
						
							2014-02-14 20:52:36 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	13e8e53941
						 | 
						
							
							
								
								
								Merge branch 'master' into type__rbenv
							
							
							
							
							
							
						 | 
						
							2014-02-14 20:51:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	1cdcb12ebd
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-14 20:51:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	490bad7b26
						 | 
						
							
							
								
								
								Merge branch 'master' into type__rbenv
							
							
							
							
							
							
						 | 
						
							2014-02-14 20:13:18 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	134a4a7b34
						 | 
						
							
							
								
								
								add discussion notes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-14 12:45:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	d55763ad6d
						 | 
						
							
							
								
								
								++release
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-14 09:59:56 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	a765fe5c07
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-14 01:48:33 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2afa0ad2fc
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-12 17:07:07 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	a4376b4d74
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-12 16:57:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	01a3f7c0b7
						 | 
						
							
							
								
								
								Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist
							
							
							
							
							
							
						 | 
						
							2014-02-12 16:56:30 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	32eee3b8e9
						 | 
						
							
							
								
								
								Merge branch 'master' into 4.0-pre-not-stable
							
							
							
							
							
							
						 | 
						
							2014-02-12 16:47:10 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	c615a82212
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-12 16:42:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Heule
								
							 
						 | 
						
							
							
								
							
							
	cfbc68aa11
						 | 
						
							
							
								
								
								bugfix if both override and order is specified
							
							
							
							
							
							
						 | 
						
							2014-02-12 10:31:46 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	e3464bef1b
						 | 
						
							
							
								
								
								release 3.0.8
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-11 22:46:25 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	9ce3809eb3
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-11 22:31:30 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	3cc49460a3
						 | 
						
							
							
								
								
								Merge branch 'master' into preos
							
							
							
							
							
							
						 | 
						
							2014-02-10 21:34:54 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	219f3a99bf
						 | 
						
							
							
								
								
								Merge branch 'master' into install_integration
							
							
							
							
							
							
						 | 
						
							2014-02-10 21:34:35 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	42b240f496
						 | 
						
							
							
								
								
								Merge branch 'master' into 4.0-pre-not-stable
							
							
							
							
							
							
						 | 
						
							2014-02-10 14:56:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2b3aba1281
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-10 07:32:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	b4373b91b3
						 | 
						
							
							
								
								
								add document to describe the flow when installing
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-10 07:22:57 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	03f99a0e55
						 | 
						
							
							
								
								
								Merge branch 'preos' into 4.0-pre-not-stable
							
							
							
							
							
							
						 | 
						
							2014-02-08 00:32:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	79973d1582
						 | 
						
							
							
								
								
								Merge branch 'master' into install_integration
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
Conflicts:
	cdist/config.py
	cdist/emulator.py 
							
						 | 
						
							2014-02-08 00:32:28 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	acddd14ce1
						 | 
						
							
							
								
								
								Merge branch 'master' into preos
							
							
							
							
							
							
						 | 
						
							2014-02-08 00:31:30 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	77df0ae324
						 | 
						
							
							
								
								
								update reference
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-08 00:14:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	f87fc63a79
						 | 
						
							
							
								
								
								cdist 3.0.7
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-08 00:13:33 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	2fa174f6ea
						 | 
						
							
							
								
								
								update link to ungleich
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-06 17:02:14 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	1be3ea4362
						 | 
						
							
							
								
								
								Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist
							
							
							
							
							
							
						 | 
						
							2014-02-06 16:32:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Heule
								
							 
						 | 
						
							
							
								
							
							
	52e2017d8f
						 | 
						
							
							
								
								
								CDIST_ALLOW_OVERRIDE -> CDIST_OVERRIDE as requested by nico
							
							
							
							
							
							
						 | 
						
							2014-02-06 16:03:07 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	49764ae5c7
						 | 
						
							
							
								
								
								++changes
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-06 15:58:25 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	724385fcf3
						 | 
						
							
							
								
								
								update manifest document for in order execution
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@bento.schottelius.org> 
							
						 | 
						
							2014-02-06 15:55:41 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	41266a1946
						 | 
						
							
							
								
								
								Merge branch 'feature__cdist_autodep_try2' of git://github.com/dheule/cdist
							
							
							
							
							
							
						 | 
						
							2014-02-06 15:48:45 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |