Difference between revisions of "MergeState kalypso 12.11"
From KalypsoDev
Gernotbelger (Talk | contribs) (Created page with "= Merge state of branch kalypso_12.11 = == 27.07.2013 nach trunk (Stefan Kurzbach) == {| class="wikitable" |- ! Repository !! Merged Revisions |- | kalypsobase || 48180-48...") |
Gernotbelger (Talk | contribs) |
||
(24 intermediate revisions by one user not shown) | |||
Line 1: | Line 1: | ||
− | = Merge state of branch kalypso_12.11 | + | = Merge state of branch kalypso_12.11 (Kalypso 13.12.x) = |
− | + | ||
− | + | ||
{| class="wikitable" | {| class="wikitable" | ||
|- | |- | ||
− | ! Repository !! Merged Revisions | + | ! Merge !! Target !! Merger !! Repository !! Merged Revisions |
|- | |- | ||
− | | kalypsobase || | + | | 26.03.2013 || trunk || Gernot Belger || kalypsobase || - 47735 |
|- | |- | ||
− | | kalypso || | + | | || || || kalypso || - 21182 |
|- | |- | ||
− | | | + | | || || || planerclient || - 2601 |
|- | |- | ||
− | | planerclient || | + | | |
− | | | + | |- |
− | + | | 08.04.2013 || trunk || Stefan Kurzbach || kalypsobase || 47735 - 47746 | |
− | + | |- | |
− | + | | || || || kalypso || 21182 - 21202 | |
− | + | |- | |
+ | | || || || k-reporting || nix | ||
+ | |- | ||
+ | | || || || planerclient || nix | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 26.04.2013 || trunk || Gernot Belger || kalypsobase || 47746-47794 | ||
+ | |- | ||
+ | | || || || kalypso || 21202-21278 | ||
+ | |- | ||
+ | | || || || k-reporting || nix | ||
+ | |- | ||
+ | | || || || planerclient || 2601-2604 | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 29.05.2013 || trunk || Gernot Belger || kalypsobase || 47794-48005 | ||
+ | |- | ||
+ | | || || || kalypso || 21278-21446 | ||
+ | |- | ||
+ | | || || || k-reporting || nix | ||
+ | |- | ||
+ | | || || || planerclient || 2604-2610 | ||
|- | |- | ||
− | + | | | |
+ | |- | ||
+ | | 07.07.2013 || trunk || Gernot Belger || kalypsobase || 48005-48180 | ||
+ | |- | ||
+ | | || || || kalypso || 21446-21536 | ||
+ | |- | ||
+ | | || || || k-reporting || nix | ||
+ | |- | ||
+ | | || || || planerclient || 2610-2622 | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 27.07.2013 || trunk || Stefan Kurzbach || kalypsobase || 48180-48292 | ||
+ | |- | ||
+ | | || || || kalypso || 21536-21586 | ||
+ | |- | ||
+ | | || || || k-reporting || nix | ||
+ | |- | ||
+ | | || || || planerclient || 2622-2628 | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 15.09.2013 || trunk || Gernot Belger || kalypsobase || 48292-48450 | ||
+ | |- | ||
+ | | || || || kalypso || 21586-21680 | ||
+ | |- | ||
+ | | || || || k-reporting || 364-364 (unchanged) | ||
+ | |- | ||
+ | | || || || planerclient || 2628-2628 (unchanged) | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 23.02.2014 || trunk || Gernot Belger || kalypsobase || 48450-49309 | ||
+ | |- | ||
+ | | || || || kalypso || 21680-22135 | ||
+ | |- | ||
+ | | || || || k-reporting || 364-389 | ||
+ | |- | ||
+ | | || || || planerclient || 2628-2655 | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 27.02.2014 || trunk || Gernot Belger || kalypsobase || 49309-49322 | ||
+ | |- | ||
+ | | || || || kalypso || 22135-22150 | ||
+ | |- | ||
+ | | || || || k-reporting || 389 (nothing to merge) | ||
+ | |- | ||
+ | | || || || planerclient || 2655-2657 | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 23.10.2014 || trunk || Gernot Belger || kalypsobase || 49322-50101 | ||
+ | |- | ||
+ | | || || || kalypso || 22150-23126 | ||
+ | |- | ||
+ | | || || || k-reporting || 389 (nothing to merge) | ||
+ | |- | ||
+ | | || || || planerclient || 2657 (nothing to merge) | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 23.01.2015 || trunk || Gernot Belger || kalypsobase || 50100-50119 | ||
+ | |- | ||
+ | | || || || kalypso || 23125-23319 | ||
+ | |- | ||
+ | | || || || k-reporting || 389 (nothing to merge) | ||
+ | |- | ||
+ | | || || || planerclient || 2657 (nothing to merge) | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | 02.02.2015 || trunk || Gernot Belger || kalypsobase || - 50550 | ||
+ | |- | ||
+ | | || || || kalypso || - 23389 | ||
+ | |- | ||
+ | | || || || k-reporting || - 389 | ||
+ | |- | ||
+ | | || || || planerclient || -2657 | ||
+ | |- | ||
+ | |- | ||
+ | | | ||
+ | |- | ||
+ | | || trunk || Gernot Belger || kalypsobase || | ||
|- | |- | ||
− | | | + | | || || || kalypso || |
|- | |- | ||
− | | | + | | || || || k-reporting || |
|- | |- | ||
− | | | + | | || || || planerclient || |
|- | |- | ||
− | |||
|} | |} |
Latest revision as of 16:11, 2 February 2015
[edit] Merge state of branch kalypso_12.11 (Kalypso 13.12.x)
Merge | Target | Merger | Repository | Merged Revisions |
---|---|---|---|---|
26.03.2013 | trunk | Gernot Belger | kalypsobase | - 47735 |
kalypso | - 21182 | |||
planerclient | - 2601 | |||
08.04.2013 | trunk | Stefan Kurzbach | kalypsobase | 47735 - 47746 |
kalypso | 21182 - 21202 | |||
k-reporting | nix | |||
planerclient | nix | |||
26.04.2013 | trunk | Gernot Belger | kalypsobase | 47746-47794 |
kalypso | 21202-21278 | |||
k-reporting | nix | |||
planerclient | 2601-2604 | |||
29.05.2013 | trunk | Gernot Belger | kalypsobase | 47794-48005 |
kalypso | 21278-21446 | |||
k-reporting | nix | |||
planerclient | 2604-2610 | |||
07.07.2013 | trunk | Gernot Belger | kalypsobase | 48005-48180 |
kalypso | 21446-21536 | |||
k-reporting | nix | |||
planerclient | 2610-2622 | |||
27.07.2013 | trunk | Stefan Kurzbach | kalypsobase | 48180-48292 |
kalypso | 21536-21586 | |||
k-reporting | nix | |||
planerclient | 2622-2628 | |||
15.09.2013 | trunk | Gernot Belger | kalypsobase | 48292-48450 |
kalypso | 21586-21680 | |||
k-reporting | 364-364 (unchanged) | |||
planerclient | 2628-2628 (unchanged) | |||
23.02.2014 | trunk | Gernot Belger | kalypsobase | 48450-49309 |
kalypso | 21680-22135 | |||
k-reporting | 364-389 | |||
planerclient | 2628-2655 | |||
27.02.2014 | trunk | Gernot Belger | kalypsobase | 49309-49322 |
kalypso | 22135-22150 | |||
k-reporting | 389 (nothing to merge) | |||
planerclient | 2655-2657 | |||
23.10.2014 | trunk | Gernot Belger | kalypsobase | 49322-50101 |
kalypso | 22150-23126 | |||
k-reporting | 389 (nothing to merge) | |||
planerclient | 2657 (nothing to merge) | |||
23.01.2015 | trunk | Gernot Belger | kalypsobase | 50100-50119 |
kalypso | 23125-23319 | |||
k-reporting | 389 (nothing to merge) | |||
planerclient | 2657 (nothing to merge) | |||
02.02.2015 | trunk | Gernot Belger | kalypsobase | - 50550 |
kalypso | - 23389 | |||
k-reporting | - 389 | |||
planerclient | -2657 | |||
trunk | Gernot Belger | kalypsobase | ||
kalypso | ||||
k-reporting | ||||
planerclient |