Commit Graph

68 Commits

Author SHA1 Message Date
Daniel Willmann 60560d74b8 Merge commit '315f10aa4759abb627f39122503874e7006db8b1' into dora 2017-06-02 15:01:44 +02:00
Neels Hofmeyr a526dd123e Merge commit '29dd84c82a756afcc44209f89fd2fd0d77307d73' into dora 2016-12-06 15:35:22 +01:00
Holger Hans Peter Freyther ba68c05621 Merge commit 'f3ffbf4db3a4a6a8c375e44c8d03f63bd4851afb' into dora 2016-03-23 12:00:39 +01:00
Holger Hans Peter Freyther 87183b8b71 Merge commit '04093241861f665ca3a7e47c5706be16269a4b9b' into dora 2015-11-27 11:03:19 +01:00
Holger Hans Peter Freyther 9d3031bb8f Merge commit '3a87c6e2f4f18b3833a9fe16c9231f6a9cf4c42c' into dora 2015-08-26 14:38:03 +02:00
Holger Hans Peter Freyther de1460dab6 Merge commit '10e1b544716747d178e6efa9e798f4141a179f9d' into dora 2015-08-12 07:54:15 +02:00
Harald Welte 2c7144acfe Merge commit '970fe3d755034e53878e8ec2041417f4e400124e' into dora 2015-08-01 18:28:57 +02:00
Holger Hans Peter Freyther 8de2d28267 Merge commit '33995b24737535a751326d4711330a9f96760cac' into dora 2015-07-23 16:08:57 +02:00
Holger Hans Peter Freyther d04b359479 Merge commit '6597f246c5afe7a180774169cff83e55277b51d8' into dora 2015-07-19 21:32:57 +02:00
Harald Welte f3e12f1297 Merge commit '5c86ed95c907f9e518a8fa3b3f6d58a8fe0a4f56' into dora 2015-07-06 14:03:33 +02:00
Holger Hans Peter Freyther 3c9ac429ac Merge commit '7e54997fbe9903d9c734cbea5e37bea71cb2fb7b' into dora 2015-06-26 13:39:22 +02:00
Holger Hans Peter Freyther 11808b7330 Merge commit '17a8ba8c038aac23bd7cadbc6ed786c72adbb350' into dora 2015-06-24 13:21:16 +02:00
Holger Hans Peter Freyther c09363a966 Merge commit '29faf705ed31e2bf30be8cc0064f26be1851fcc3' into dora 2015-06-23 16:36:22 +02:00
Holger Hans Peter Freyther ad81ff7de9 Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora 2015-05-13 09:33:27 +02:00
Harald Welte 864ea38cb9 Merge commit '62856a3a9b246d714d60820582dfa03b34408d6a' into dora 2015-05-02 14:19:42 +02:00
Harald Welte 2a0308613d Merge commit '1e38dac840ad6493b68559d5878f1bb4bbe95027' into dora 2015-05-02 12:29:34 +02:00
Harald Welte e31d5e8e13 Merge commit '4c6162968fc7b298bff6c06861bb287d35d0863f' into dora 2015-05-01 20:00:09 +02:00
Harald Welte 65bed443a2 Merge commit 'a3b942cdd9cb675589ac424130003b892208f371' into dora 2015-05-01 19:47:16 +02:00
Harald Welte bcbe10686b Merge commit '8c70168d4001d029a60ab155042785ff831f3f9b' into dora 2015-05-01 17:51:49 +02:00
Harald Welte e39ad31981 Merge commit '90b40a8448e773237a6d5e241c278867a7eff750' into dora 2015-04-20 20:52:15 +02:00
Holger Hans Peter Freyther bd6b673e26 Merge commit '9934406adea76c57b4f1c34cbf9dfe6e5db35515' into dora 2015-04-20 10:11:40 -04:00
Holger Hans Peter Freyther d98550a233 Merge commit 'e0bcee0206fd3052fd2cf45c587957e6143fd1c7' into dora
With interfaces change from harald and the init script revert
2015-04-20 09:56:59 -04:00
Holger Hans Peter Freyther aa5270f6b1 Merge commit '259e1fa468e8af48c6e3382fe5de025d10bb8fbc' into dora 2015-04-15 18:39:45 -04:00
Holger Hans Peter Freyther 121891e463 Merge commit '9bd8feb83c1e5259ef705cc641cc968362a04fe6' into dora 2015-04-14 15:10:28 +02:00
Holger Hans Peter Freyther 305ee03b28 Merge commit 'e0c7f3c62132ff7b1a9c7d2c01ef2be60c6c0ddc' into dora 2015-04-13 17:43:07 +02:00
Holger Hans Peter Freyther 1620d1e81d Merge commit 'ba8eee83bd2ac4d13a00b20d92ed2c19a20052bc' into dora 2015-04-13 17:14:32 +02:00
Holger Hans Peter Freyther 05216f5a96 Merge commit '8e95d188c5597485b54e3fac8210ea532e221870' into dora 2015-04-10 15:30:44 +02:00
Holger Hans Peter Freyther 436d02dfa6 Merge commit '1f660fd4b00076baa867a75fdf766e8fe2c75b9d' into dora 2015-03-31 17:08:27 +02:00
Holger Hans Peter Freyther a44ed4fd61 Merge commit '143a630c0239817377cb40b6173b6899d7160a7e' into dora 2015-02-27 11:47:41 +01:00
Holger Hans Peter Freyther 8850542075 Merge commit '1241f0e762cadab0ac6d5ccb4e866286b4799d7d' into dora 2015-02-27 09:10:54 +01:00
Holger Hans Peter Freyther 20d11ba2a2 Merge commit '9f334509d84ead91d73e5ff2c44eb7d22d5a95e6' into dora 2015-02-24 14:21:09 +01:00
Harald Welte 78a71230c3 Merge commit '7daf173e303492e1fb8400793841e305529c3852' into dora 2015-02-23 21:48:46 +01:00
Harald Welte 77bd929be1 Merge commit 'c2356c429d8cfd6c22d694f67b70de62c1bca643' into dora 2015-02-23 21:06:16 +01:00
Harald Welte be1e58f0c3 Merge commit '9b377fd3a960f56e3f2dc46f3d7006ed6c8cf587' into dora 2015-02-23 16:31:04 +01:00
Holger Hans Peter Freyther 6cae788ecb Merge commit 'cf53c2b4e0f32697f9c13ae74a22d3f5e56e9b84' into dora 2015-02-22 02:13:29 +01:00
Harald Welte 7fe10b247b Merge commit '4235a5776f5be9a989985048b192d2dd78ced809' into dora 2015-02-20 14:32:37 +01:00
Harald Welte 4a476598a3 Merge commit '42d9a2747fc9bf704e9cc3e37d70e596d2f73899' into dora 2015-02-20 12:43:19 +01:00
Harald Welte e02115a382 Merge commit '21871fa648bfa17f00386e2b0c49946daa51706c' into dora 2015-02-20 12:40:50 +01:00
Harald Welte 4c10771fc4 Merge commit 'f47375cb49cd2d7cd41022e116ed089c5537bc00' into dora 2015-02-20 12:36:01 +01:00
Harald Welte 07f3875919 Merge commit 'b386e617120844046e46b1178ba665bb6e1f5217' into dora 2015-02-20 12:32:06 +01:00
Harald Welte c631f3ea01 Merge commit '823aa457c690c24ad835618a457932a1b4ab738d' into dora 2015-02-20 12:28:24 +01:00
Harald Welte f176345e8e Merge commit '979f16d1b1b522c677e1578aa7b0779805d99eb6' into dora 2015-02-20 12:27:17 +01:00
Harald Welte db89f2037b Merge commit '74b87851e194827cc0db9dd87203bed4784fa3d0' into dora 2015-02-20 12:19:11 +01:00
Harald Welte 4998486b95 Merge commit '38d1587db55d0bad2a6cf32a7939998738a899a2' into dora 2015-02-20 11:33:48 +01:00
Holger Hans Peter Freyther d0eaf31cec Merge commit '78d586c8910f2d66400fdeee56fe176f4de96288' into dora 2015-02-14 21:00:56 +01:00
Holger Hans Peter Freyther 9d376794fc Merge commit '674b7ea9894888bc2008d732135b73a22568ea89' into dora 2015-02-14 20:38:00 +01:00
Holger Hans Peter Freyther c2ee669136 Merge commit 'adbc448df6520702b697938417b53e157e26a927' into dora 2015-02-14 13:37:01 +01:00
Harald Welte 729ec80937 Merge commit 'f01baf4cfbdb55ac223903f14b9ab5aee3cf983a' into dora 2015-02-13 19:26:28 +01:00
Holger Hans Peter Freyther 0f2f51f20c Merge commit '3f2d2d338122e71b6a22f58f43e57ac8dfb3fcc1' into dora 2015-02-13 19:17:41 +01:00
Holger Hans Peter Freyther 38e58aca4d Merge commit '9bac297806e30162a77e34ad04ea516f7f697833' into dora 2015-02-13 17:00:00 +01:00