| 
							
							
								 Joanna Rutkowska | 70ad4146e1 | version 1.7.17 | 2012-03-09 09:46:06 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 703c74397f | vm/netwatcher: fix watch | 2012-03-09 01:54:16 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 9de77d7fe4 | vm/qvm-firewall: force firewall reload on service start (#478) This makes firewall reload triggered by qubes-netwatcher working again. | 2012-03-09 01:50:51 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 4401c3e525 | vm/init.d: make firewall and netwatcher service consistent with systemd | 2012-03-09 01:50:18 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | aa0d767e8a | vm/netwatcher: watch also for netvm change (#478) | 2012-03-09 01:01:30 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 31ccbce992 | Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core | 2012-03-09 01:00:08 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 531449b16f | vm/qubes_netwatcher: correct type in service name (#465) This prevented netwatcher being started in the firewallvm. | 2012-03-09 00:21:54 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | f846d890b5 | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm Conflicts:
	version_dom0 | 2012-03-09 00:01:06 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 0ad42ab63f | version 1.7.16 | 2012-03-08 21:45:55 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 281d2e3870 | Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core | 2012-03-08 21:40:30 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 060b55ba8a | Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm Conflicts:
	version_dom0 | 2012-03-08 18:06:30 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | ba7822975d | Merge branch 'master' into hvm Conflicts:
	dom0/qvm-core/qubes.py
	version_dom0
	version_vm | 2012-03-08 15:03:49 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | c9cc8d6058 | vm/network: use metric to allow multiple routes to same VM This is required when VM has multiple interfaces (eg HVM: PV and stubdom).
Prefer the later one. | 2012-03-08 15:00:24 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | fccdc63473 | vm/network: really place anti-spoof rules in 'raw' table This fixes commit:
4d68998 vm/network: place anti-spoof rules in 'raw' table | 2012-03-08 15:00:20 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 2b3939ab64 | vm/network: use metric to allow multiple routes to same VM This is required when VM has multiple interfaces (eg HVM: PV and stubdom).
Prefer the later one. | 2012-03-08 14:57:10 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 8a7906a016 | vm/network: really place anti-spoof rules in 'raw' table This fixes commit:
4d68998 vm/network: place anti-spoof rules in 'raw' table | 2012-03-08 14:56:39 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | a2df8d8a7c | version 1.7.15 | 2012-03-08 12:44:41 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 2e0cc83c1a | Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm Conflicts:
	version_dom0
	version_vm | 2012-03-06 22:25:32 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | f7b923db6a | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm | 2012-03-06 22:25:07 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | a2afb6e054 | version 1.7.14 | 2012-03-06 16:07:39 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 5fda94f958 | Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core | 2012-03-06 16:01:12 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 51a3a5ffe4 | Merge branch 'master' into hvm | 2012-03-06 14:47:20 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 21543dbb4c | Merge branch 'master' into hvm Conflicts:
	dom0/qvm-core/qubes.py | 2012-03-06 02:21:52 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 811b597f2b | Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm | 2012-03-04 22:34:22 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | fa905c764d | Merge branch 'master' into hvm | 2012-03-03 02:19:02 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 23e1e1db1f | vm/network: place anti-spoof rules in 'raw' table | 2012-03-03 01:30:04 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 6610b22f97 | vm/network: replace route in more elegant way | 2012-03-03 01:26:06 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 2062a937b4 | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm | 2012-03-02 16:46:39 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 9904a42203 | Merge branch 'master' into hvm | 2012-03-02 16:31:01 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 1b4f6859b6 | Merge branch 'master' into hvm Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs | 2012-03-02 16:21:48 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 402aae03a5 | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm | 2012-03-02 14:48:41 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | f181dcb5b5 | version 2.0.3 | 2012-03-02 02:33:05 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | cc7b423242 | Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm | 2012-03-02 02:29:29 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | d51ba63b81 | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm | 2012-03-02 02:25:24 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 00b0bd6d42 | Merge branch 'master' of git://git.qubes-os.org/joanna/core into hvm Conflicts:
	version_dom0
	version_vm | 2012-03-02 02:24:37 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 67369b170b | vm/dom-updates: always use --resolve Required when update needs some additional packages | 2012-03-02 00:34:36 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 5dcaa52350 | Merge branch 'master' into hvm | 2012-03-01 23:40:31 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 33c8c83cd9 | version 2.0.2 | 2012-03-01 12:46:18 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 0e0ce9188b | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm | 2012-03-01 12:45:21 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 57e4423cac | version 1.7.13 | 2012-02-29 10:36:42 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | a20709db45 | Merge branch 'master' into hvm | 2012-02-29 03:58:29 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 2d925b4aa4 | Merge branch 'master' into hvm | 2012-02-27 15:14:21 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 3239c7f0bc | version 2.0.1 | 2012-02-27 15:02:36 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 1b5434a13e | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm | 2012-02-27 15:00:54 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 08cde34d01 | version 2.0.0 | 2012-02-27 13:31:42 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | a848e03715 | Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm | 2012-02-27 13:30:14 +01:00 |  | 
			
				
					| 
							
							
								 Joanna Rutkowska | 4b3bb9f436 | Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core | 2012-02-27 13:17:48 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | cd45ef1de6 | vm/yum.repo: use separate key for unstable repo | 2012-02-26 13:10:04 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 41a0366719 | vm/network: do not fail when route already exists - override it | 2012-02-24 17:10:16 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 366e59a8de | version 1.7.12 | 2012-02-23 09:41:56 +01:00 |  |